2024-07-02 功能优化

2 years ago · 04d2f1173b
8 changed files with 150 additions and 47 deletions
--- a/src/router/index.js
+++ b/src/router/index.js
@ -20,6 +20,7 @@ const _import = require('./import-' + process.env.NODE_ENV)
 const globalRoutes = [
  { path: '/404', component: _import('common/404'), name: '404', meta: { title: '404未找到' } },
  { path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } },
+  { path: '/image', component: _import('common/image'), name: 'image', meta: { title: '预览' } },
 ]

 // 主入口路由(需嵌套上左右整体布局)
--- a/src/views/common/image.vue
+++ b/src/views/common/image.vue
@ -0,0 +1,29 @@
+<script>
+
+export default{
+  data(){
+    return{
+      url:'',
+    }
+  },
+  created() {
+    const url = localStorage.getItem("imgUrl");
+    if (url) {
+      this.url = url;
+      localStorage.removeItem("imgUrl")
+    }
+  }
+}
+
+</script>
+
+<template>
+ <div style="margin: 0 auto;text-align: center;line-height: 100vh">
+<!--   <img :src="url" v-viewer>-->
+   <el-image :src="url"></el-image>
+ </div>
+</template>
+
+<style scoped>
+
+</style>
--- a/src/views/modules/common/Chooselist.vue
+++ b/src/views/modules/common/Chooselist.vue
@ -179,7 +179,7 @@ export default {
      if (this.param3) {
        sql += " and active like '%" + this.param3 + "%'"
      }
-      if (this.tagNo <1000 && this.tagNo !== 93){
+      if (this.tagNo <1000 && this.tagNo !== 212){
        if (this.param4) {
          sql += " and site=" + this.param4
        }
--- a/src/views/modules/common/Chooselist_eam.vue
+++ b/src/views/modules/common/Chooselist_eam.vue
@ -207,7 +207,7 @@ export default {
      if (this.param6 ) {
        sql += " and active like '%" + this.param6 + "%'"
      }
-      if (this.tagNo <= 500 && this.tagNo !== 93) { // 判断site和bu
+      if (this.tagNo <= 500 && this.tagNo !== 212) { // 判断site和bu
        if (this.param7) {
          sql += " and site in (select site from eam_access_site where username = '" + this.param7 + "') " + " and (site + '-' + bu_no) in (select (a.site + '-' + a.bu_no) from AccessBu as a left join eam_access_site as b on a.site = b.site and a.username = b.username where a.username = '" + this.param7 + "')"
        }
--- a/src/views/modules/qc/FQASResultEntry.vue
+++ b/src/views/modules/qc/FQASResultEntry.vue
@ -170,22 +170,29 @@
          <el-input v-model="detailData.partDesc" disabled style="width: 220px"></el-input>
        </el-form-item>
        <el-form-item :label="'计量单位'">
-          <el-input v-model="detailData.umId" disabled style="width: 120px"></el-input>
+          <el-input v-model="detailData.umId" disabled style="width: 80px"></el-input>
        </el-form-item>
        <el-form-item :label="'到货数量'">
-          <el-input class="numInput" v-model="detailData.rollQty" type="number" disabled style="width: 120px"></el-input>
+          <el-input class="numInput" v-model="detailData.rollQty" type="number" disabled style="width: 80px"></el-input>
        </el-form-item>
        <el-form-item :label="'送检数量'">
-          <el-input class="numInput" v-model="detailData.rollCount" readonly type="number" style="width: 120px"></el-input>
+          <el-input class="numInput" v-model="detailData.rollCount" type="number" style="width: 80px"></el-input>
        </el-form-item>
        <el-form-item :label="'抽样数量'">
-          <el-input class="numInput" v-model="detailData.samplingQty" readonly type="number" style="width: 120px"></el-input>
+          <el-input class="numInput" v-model="detailData.samplingQty" type="number" style="width: 80px"></el-input>
        </el-form-item>
        <el-form-item :label="'不合格项目数量'">
          <el-input class="numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
          <el-input class="numInput" v-else @input="handleInput(detailData.unqualifiedQty,1)" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
        </el-form-item>
-        <el-form-item :label="' '" style="margin-left: 50px">
+        <el-form-item :label="'合格数量'">
+          <el-input class="numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.passQty" disabled type="number" style="width: 80px"></el-input>
+          <el-input class="numInput" v-else @input="handleInput(detailData.passQty,2)" v-model="detailData.passQty" type="number" style="width: 80px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'不合格数量'">
+          <el-input class="numInput" v-model="detailData.notPassQty" type="number" disabled style="width: 80px"></el-input>
+        </el-form-item>
+        <el-form-item :label="' '" style="margin-left: 25px">
          <el-button type="primary" @click="getFileContentData(detailData)">工作文件</el-button>
        </el-form-item>
      </el-form>
@ -195,14 +202,14 @@
            <el-option label="合格" value="合格"></el-option>
            <el-option label="不合格" value="不合格"></el-option>
          </el-select>
-          <el-select v-else v-model="detailData.inspectionResult" style="width: 100px" placeholder="请选择">
+          <el-select v-else v-model="detailData.inspectionResult" @change="resultChange" style="width: 100px" placeholder="请选择">
            <el-option label="合格" value="合格"></el-option>
            <el-option label="不合格" value="不合格"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item :label="'质检备注'">
-          <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
-          <el-input v-else v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
+          <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 310px"></el-input>
+          <el-input v-else v-model="detailData.inspectionRemark" style="width: 310px"></el-input>
        </el-form-item>
        <el-form-item label="检验员">
          <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
@ -232,7 +239,7 @@
          <span v-else style="cursor: pointer" slot="label" @click="getResponsiblePersonList"><a>责任人</a></span>
          <el-input v-model="detailData.responsiblePersonName" readonly style="width: 224px"></el-input>
        </el-form-item>
-        <el-form-item :label="' '" style="margin-left: 47px">
+        <el-form-item :label="' '" style="margin-left: 20px">
          <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button>
        </el-form-item>
      </el-form>
@ -580,6 +587,12 @@
      subDetailUpload
    },
    watch: {
+      detailData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty
+        }
+      },
      detailList: {
        deep: true,
        handler: function (newV, oldV) {
@ -1334,7 +1347,9 @@
          operator: '',
          operatorName: '',
          responsiblePerson: '',
-          responsiblePersonName: ''
+          responsiblePersonName: '',
+          passQty: '',
+          notPassQty: ''
        },
        detailInformationFlag: false,
        detailList: [],
@ -1356,7 +1371,9 @@
          operatorName: '',
          responsiblePerson: '',
          responsiblePersonName: '',
-          subDetailList: []
+          subDetailList: [],
+          passQty: '',
+          notPassQty: ''
        },
        // 子明细数据对象
        tableData: [],
@ -1485,6 +1502,12 @@
    },

    methods: {
+      // 检验结论改变事件
+      resultChange () {
+        if (this.detailData.inspectionResult === '不合格') {
+          this.detailData.passQty = 0
+        }
+      },
      // 数据采集
      dataAcquisition () {
        this.loadFlag = true
@ -1730,6 +1753,8 @@
        }
        if (type === 1) {
          this.detailData.unqualifiedQty = val
+        } else if (type === 2) {
+          this.detailData.passQty = val
        }
      },

@ -1879,6 +1904,16 @@
          this.$message.warning(`暂不支持预览${row.fileType.toLowerCase()}文件`)
          return;
        }
+        // downLoadObjectFile(row).then(({data}) => {
+        //   const blob = new Blob([data], { type: type });
+        //   // 创建URL来生成预览
+        //   const fileURL = URL.createObjectURL(blob);
+        //   // alert(blob)
+        //   localStorage.setItem("imgUrl",fileURL)
+        //   window.open(window.location.origin+"/#/image",'_blank')
+        //   // 在新标签页中打开文件预览
+        //   // const newTab = window.open(fileURL, '_blank')
+        // })
        downLoadObjectFile(row).then(({data}) => {
          const blob = new Blob([data], { type: type });
          // 创建URL来生成预览
@ -2031,6 +2066,8 @@
        this.saveInformationData.operator = this.detailData.operator
        this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
        this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
+        this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty
+        this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty
        // this.saveInformationData.subDetailList = this.acquisitionList
        saveFQASDetailedRecord(this.saveInformationData).then(({data}) => {
          if (data && data.code === 0) {
@ -2105,6 +2142,8 @@
        this.detailData.operatorName = row.operatorName
        this.detailData.responsiblePerson = row.responsiblePerson
        this.detailData.responsiblePersonName = row.responsiblePersonName
+        this.detailData.passQty = row.passQty
+        this.detailData.notPassQty = row.notPassQty
        this.getInspectionFormData()
        this.inspectorSearch()
        // this.acquisitionList = []
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@ -308,10 +308,10 @@
          <el-input v-model="detailData.partDesc" readonly style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item :label="'送检数量'">
-          <el-input class="numInput" v-model="detailData.rollQty" readonly type="number" style="width: 80px"></el-input>
+          <el-input class="numInput" v-model="detailData.rollQty" type="number" style="width: 80px"></el-input>
        </el-form-item>
        <el-form-item :label="'抽样数量'">
-          <el-input class="numInput" v-model="detailData.samplingQty" readonly type="number" style="width: 80px"></el-input>
+          <el-input class="numInput" v-model="detailData.samplingQty" type="number" style="width: 80px"></el-input>
        </el-form-item>
        <el-form-item :label="'单位'">
          <el-input v-model="detailData.umName" readonly style="width: 80px"></el-input>
@ -334,7 +334,7 @@
            <el-option label="合格" value="合格"></el-option>
            <el-option label="不合格" value="不合格"></el-option>
          </el-select>
-          <el-select v-else v-model="detailData.inspectionResult" style="width: 100px" placeholder="请选择">
+          <el-select v-else v-model="detailData.inspectionResult" @change="resultChange" style="width: 100px" placeholder="请选择">
            <el-option label="合格" value="合格"></el-option>
            <el-option label="不合格" value="不合格"></el-option>
          </el-select>
@ -2214,6 +2214,12 @@
    },

    methods: {
+      // 检验结论改变事件
+      resultChange () {
+        if (this.detailData.inspectionResult === '不合格') {
+          this.detailData.passQty = 0
+        }
+      },
      // 数据采集
      dataAcquisition () {
        this.loadFlag = true
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@ -38,11 +38,14 @@
    </el-form>
    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
      <el-form-item :label="'供应商'">
-        <el-input v-model="searchData.supplierDesc" clearable style="width: 200px"></el-input>
+        <el-input v-model="searchData.supplierDesc" clearable style="width: 170px"></el-input>
      </el-form-item>
      <el-form-item :label="'质检员'">
        <el-input v-model="searchData.inspectorName" clearable style="width: 120px"></el-input>
      </el-form-item>
+      <el-form-item :label="'仓库'">
+        <el-input v-model="searchData.warehouseName" clearable style="width: 120px"></el-input>
+      </el-form-item>
      <el-form-item :label="'状态'">
        <el-select v-model="searchData.states" multiple style="width: 340px">
          <el-option label="未开始" value="未开始"></el-option>
@ -68,16 +71,16 @@
          </el-option>
        </el-select>
      </el-form-item>
-      <el-form-item :label="'采购类型'">
-        <el-select v-model="searchData.orderType" clearable style="width: 90px">
-          <el-option
-            v-for = "i in orderTypeList"
-            :key = "i.orderType"
-            :label = "i.orderType"
-            :value = "i.orderType">
-          </el-option>
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item :label="'采购类型'">-->
+<!--        <el-select v-model="searchData.orderType" clearable style="width: 90px">-->
+<!--          <el-option-->
+<!--            v-for = "i in orderTypeList"-->
+<!--            :key = "i.orderType"-->
+<!--            :label = "i.orderType"-->
+<!--            :value = "i.orderType">-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
    </el-form>
    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
      <el-form-item :label="'送检日期'">
@ -197,10 +200,10 @@
          <el-input class="numInput" v-model="detailData.rollQty" type="number" disabled style="width: 80px"></el-input>
        </el-form-item>
        <el-form-item :label="'送检数量'">
-          <el-input class="numInput" v-model="detailData.rollCount" readonly type="number" style="width: 80px"></el-input>
+          <el-input class="numInput" v-model="detailData.rollCount" type="number" style="width: 80px"></el-input>
        </el-form-item>
        <el-form-item :label="'抽样数量'">
-          <el-input class="numInput" v-model="detailData.samplingQty" readonly type="number" style="width: 80px"></el-input>
+          <el-input class="numInput" v-model="detailData.samplingQty" type="number" style="width: 80px"></el-input>
        </el-form-item>
        <el-form-item :label="'不合格项目数量'">
          <el-input class="numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
@ -226,7 +229,7 @@
            <el-option label="合格" value="合格"></el-option>
            <el-option label="不合格" value="不合格"></el-option>
          </el-select>
-          <el-select v-else v-model="detailData.inspectionResult" style="width: 100px" placeholder="请选择">
+          <el-select v-else v-model="detailData.inspectionResult" @change="resultChange" style="width: 100px" placeholder="请选择">
            <el-option label="合格" value="合格"></el-option>
            <el-option label="不合格" value="不合格"></el-option>
          </el-select>
@ -675,6 +678,7 @@
          poItemNo: '',
          orderType: '',
          states: ['未开始','待检验'],
+          warehouseName: ''
        },
        pageIndex: 1,
        pageSize: 20,
@ -815,6 +819,24 @@
            fixed: '',
            columnWidth: 120,
          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1WarehouseName',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'warehouseName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '仓库',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
          {
            userId: this.$store.state.user.name,
            functionId: 301006,
@ -849,7 +871,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
-            columnWidth: 200,
+            columnWidth: 350,
          },
          {
            userId: this.$store.state.user.name,
@ -1668,7 +1690,7 @@
      this.getSiteAndBuByUserName()
      this.favoriteIsOk()
      this.disposalMeasuresSearch()
-      this.orderTypeSearch()
+      //this.orderTypeSearch()
      // 动态列
      this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
      this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
@ -1681,6 +1703,12 @@
    },

    methods: {
+      // 检验结论改变事件
+      resultChange () {
+        if (this.detailData.inspectionResult === '不合格') {
+          this.detailData.passQty = 0
+        }
+      },
      // 数据采集
      dataAcquisition () {
        this.loadFlag = true
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@ -30,12 +30,12 @@
            <el-input v-model="dataForm.mobile" style="width: 150px;" placeholder="手机号"></el-input>
          </el-form-item>
        </el-form>
-<!--        <el-form>-->
-<!--          <el-form-item>-->
-<!--            <span slot="label" style="" @click="getBaseList(93)"><a herf="#">{{buttons.site||'工厂'}}</a></span>-->
-<!--            <el-input v-model="dataForm.site" style="width: 150px;" placeholder="工厂"></el-input>-->
-<!--          </el-form-item>-->
-<!--        </el-form>-->
+        <el-form>
+          <el-form-item>
+            <span slot="label" style="" @click="getBaseList(212)"><a herf="#">{{buttons.site||'工厂'}}</a></span>
+            <el-input v-model="dataForm.site" style="width: 150px;" placeholder="工厂"></el-input>
+          </el-form-item>
+        </el-form>
        <el-form>
          <el-form-item label="角色" size="mini" prop="roleIdList">
            <el-checkbox-group v-model="dataForm.roleIdList">
@ -62,13 +62,13 @@
    </span>
    </el-dialog>

-    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
  </div>

 </template>

 <script>
-  import Chooselist from '@/views/modules/common/Chooselist'
+  import Chooselist from '@/views/modules/common/Chooselist_eam'
 import {getFactory} from "@/api/factory";
 import {searchSysLanguage} from "@/api/sysLanguage.js"
  import {
@ -133,7 +133,7 @@ export default {
      })
    },
    getBaseData(val){
-      if (this.tagNo === 93){
+      if (this.tagNo === 212){
        this.dataForm.site = val.SiteID
      }
    },
@ -142,7 +142,7 @@ export default {
      this.tagNo = val
      this.$nextTick(() => {
        let strVal = "";
-        if (val === 93){
+        if (val === 212){
          strVal = this.dataForm.site
        }
        this.$refs.baseList.init(val,strVal)
@ -195,10 +195,10 @@ export default {
    },
    // 表单提交
    dataFormSubmit() {
-      // if(this.dataForm.site == null || this.dataForm.site == ''){
-      //   this.$message.success("工厂不能为空!");
-      //   return false;
-      // }
+      if(this.dataForm.site == null || this.dataForm.site === ''){
+        this.$message.success("工厂不能为空!");
+        return false;
+      }
      this.$refs['dataForm'].validate((valid) => {
        if (valid) {
          this.$http({
@ -214,7 +214,7 @@ export default {
              'status': this.dataForm.status,
              'roleIdList': this.dataForm.roleIdList,
              'languageDefault': this.dataForm.languageDefault,
-              'site': '2',
+              'site': this.dataForm.site,
              'userDisplay': this.dataForm.userDisplay,
            })
          }).then(({data}) => {