Merge remote-tracking branch 'origin/master'

src/views/modules/eam/eamWorkOrderForDefect.vue

@@ -31,6 +31,13 @@
           <el-option label="已取消" value="已取消"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'单据来源'">
+        <el-select v-model="searchData.documentSource" style="width: 100px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="设备点检" value="设备点检"></el-option>
+          <el-option label="设备维修" value="设备维修"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'计划执行日期：'">
         <el-date-picker
           style="width: 120px"
@@ -394,6 +401,7 @@
           startDate:'',
           endDate:'',
           departmentName: '',
+          documentSource: '',
           page: 1,
           limit: 10,
         },
@@ -830,6 +838,24 @@
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101018,
+            serialNumber: '101018TableActualRemark',
+            tableId: "101018Table",
+            tableName: "common",
+            columnProp: 'documentSource',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '单据来源',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
         ],
         changeModelFlag:false,
         planOperator:'',

src/views/modules/qc/FAIResultEntry.vue

@@ -741,7 +741,7 @@
         searchData: {
           site: this.$store.state.user.site,
           inspectionNo: '',
-          state: '',
+          state: '待检验',
           inspectionResult: '',
           orderNo: '',
           operationDesc: '',

src/views/modules/qc/FQCResultEntry.vue

@@ -740,7 +740,7 @@
         searchData: {
           site: this.$store.state.user.site,
           inspectionNo: '',
-          state: '',
+          state: '待检验',
           inspectionResult: '',
           orderNo: '',
           operationDesc: '',

src/views/modules/qc/IPQCResultEntry.vue

@@ -757,7 +757,7 @@
         searchData: {
           site: this.$store.state.user.site,
           inspectionNo: '',
-          state: '',
+          state: '待检验',
           inspectionResult: '',
           orderNo: '',
           operationDesc: '',

src/views/modules/qc/IQCResultEntry.vue

@@ -38,7 +38,13 @@
         <el-input v-model="searchData.supplierDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'处置措施'">
-        <el-input v-model="searchData.disposalMeasures" clearable style="width: 120px"></el-input>
+        <el-select v-model="searchData.disposalMeasures" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="缺少备件" value="缺少备件"></el-option>
+          <el-option label="等待售后" value="等待售后"></el-option>
+          <el-option label="远程协助" value="远程协助"></el-option>
+          <el-option label="换班换人" value="换班换人"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item :label="'质检员'">
         <el-input v-model="searchData.inspectorName" clearable style="width: 120px"></el-input>
@@ -501,7 +507,7 @@
           endDate: '',
           partNo:'',
           partDesc:'',
-          state: '',
+          state: '待检验',
           inspectionResult: '',
           supplierDesc: '',
           disposalMeasures: '',

src/views/modules/reportWorkOrder/reportDefectOrder.vue

@@ -28,6 +28,13 @@
           <el-option label="已到达" value="已到达"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'单据来源'">
+        <el-select v-model="searchData.documentSource" style="width: 100px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="设备点检" value="设备点检"></el-option>
+          <el-option label="设备维修" value="设备维修"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'计划执行日期：'">
         <el-date-picker
           style="width: 120px"
@@ -396,7 +403,8 @@
           endDate:'',
           page: 1,
           limit: 10,
-          searchType: 'reportDefect'
+          searchType: 'reportDefect',
+          documentSource: ''
         },
         height: 200,
         pageIndex: 1,
@@ -690,6 +698,23 @@
             status: true,
             fixed: '',
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TableActualRemark',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'documentSource',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '单据来源',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
         ],
         detailModelFlag:false,
         detailList:[],
@@ -1243,7 +1268,7 @@
       },
 
       // 执行
-      reportModal(row){
+      reportModal (row) {
         this.saveData = {
           site: row.site,
           functionType: 'C',
@@ -1274,23 +1299,23 @@
       },
 
       saveCheckReport () {
-        if(this.saveData.defectID === '' || this.saveData.defectID == null){
+        if (this.saveData.defectID === '' || this.saveData.defectID == null) {
           this.$message.warning('请选择故障编码！')
           return
         }
-        if(this.saveData.result === '' || this.saveData.result == null){
+        if (this.saveData.result === '' || this.saveData.result == null) {
           this.$message.warning('请选择维修结果！')
           return
         }
-        if(this.saveData.result === '维修失败' && (this.saveData.disposalMeasures == null || this.saveData.disposalMeasures === '')){
+        if (this.saveData.result === '维修失败' && (this.saveData.disposalMeasures == null || this.saveData.disposalMeasures === '')) {
           this.$message.warning('请选择处置措施！')
           return
         }
-        if(this.saveData.operator == null || this.saveData.operator === ''){
+        if (this.saveData.operator == null || this.saveData.operator === '') {
           this.$message.warning('请选择维修人员！')
           return
         }
-        if(this.saveData.handlingMethod == null || this.saveData.handlingMethod === ''){
+        if (this.saveData.handlingMethod == null || this.saveData.handlingMethod === '') {
           this.$message.warning('请填写处理方式！')
           return
         }
@@ -1313,13 +1338,13 @@
       },
 
       // 上传故障图片
-      uploadFaultImageModal(){
+      uploadFaultImageModal () {
         let currentData = {
           site: this.$store.state.user.site,
           createBy: this.$store.state.user.name,
           orderNo: this.saveData.orderNo,
           folder: 'reportFault',
-        };
+        }
         //打开组件 去做新增业务
         this.$nextTick(() => {
           this.$refs.reportImageUpload.init(currentData);
@@ -1333,7 +1358,7 @@
           createBy: this.$store.state.user.name,
           orderNo: this.saveData.orderNo,
           folder: 'reportSparPart',
-        };
+        }
         //打开组件 去做新增业务
         this.$nextTick(() => {
           this.$refs.reportImageUpload.init(currentData);