Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js

@@ -66,7 +66,7 @@ export const getWorkList = (params) =>{
 // 获取工序下拉数据
 export const getProcessList = (params) =>{
     return request({
-        url:'/api/blade-desk/dsProcess/list',
+        url:'/api/blade-desk/bsProcessSet/list',
         method:'get',
         params
     })

src/views/basicData/components/addRuleDialog.vue

@@ -27,6 +27,8 @@
                                 v-model="scope.row.craftAbilityId" 
                                 placeholder="请选择"
                                 style="width: 100%"
+                                filterable
+                                
                             >
                                 <el-option
                                 v-for="item in capabilityData"
@@ -53,6 +55,7 @@
                                 v-model="scope.row.prodMarkId" 
                                 placeholder="请选择生产标识"
                                 style="width: 100%"
+                                filterable
                             >
                                 <el-option
                                 v-for="item in identificationData"
@@ -137,6 +140,8 @@
                                 v-model="scope.row.oemId" 
                                 placeholder="请选择外协厂商"
                                 style="width: 100%"
+                                filterable
+                                clearable
                             >
                                 <el-option v-for="item in companyData" :label="item.ocName" :key="item.id" :value="item.id"></el-option>
                             </el-select>
@@ -153,6 +158,8 @@
                                 v-model="scope.row.centerId" 
                                 placeholder="请选择作业中心"
                                 style="width: 100%"
+                                filterable
+                                clearable
                             >
                                 <el-option v-for="item in workCenterData" :label="item.wcName" :key="item.id" :value="item.id"></el-option>
                             </el-select>
@@ -204,6 +211,7 @@ export default {
             form:{
                 tableData:[]
             },
+            craftloading:false,
             formRules:{
                 craftAbilityId:[
                     { required: true, message: '请选择工艺能力', trigger: ['change', 'submit'] }
@@ -253,6 +261,16 @@ export default {
         
     },
     methods:{
+        // remoteMethodCraft(query){
+        //     console.log('query', query)
+        //     if(query){
+
+        //     }else{
+        //         getCapability().then(res =>{
+        //             this.capabilityData = res.data.data
+        //         })
+        //     }
+        // },
         getPointRule(){
             getPointRule().then(res =>{
                 this.pointRule = res.data.data
@@ -311,16 +329,16 @@ export default {
                     });
                     return;
                 }
-                this.form.tableData.map(item =>{
-                    if(item.pointType == 1 && (!item.oemId || item.oemId == '')){
-                        this.formError = '指定类型为外协时，请选择外协厂商';
-                        return
-                    }
-                    if(item.pointType == 0 && (!item.centerId || item.centerId == '')){
-                        this.formError = '指定类型为厂内时，请选择作业中心';
-                        return
-                    }
-                })
+                // this.form.tableData.map(item =>{
+                //     if(item.pointType == 1 && (!item.oemId || item.oemId == '')){
+                //         this.formError = '指定类型为外协时，请选择外协厂商';
+                //         return
+                //     }
+                //     if(item.pointType == 0 && (!item.centerId || item.centerId == '')){
+                //         this.formError = '指定类型为厂内时，请选择作业中心';
+                //         return
+                //     }
+                // })
 
                 console.log('form----------',this.form.tableData)
                 // 校验通过：准备提交数据（过滤无用字段）

src/views/productionSchedulingPlan/basic/qualityGrade.vue

@@ -142,7 +142,7 @@ export default {
           },
           {
             label: '类型',
-            prop: 'type',
+            prop: 'types',
             search: false,
             multiple: true,
             sortable: true,
@@ -184,11 +184,11 @@ export default {
             dicData:[
               {
                 label:'是',
-                value:1
+                value:'1'
               },
               {
                 label:'否',
-                value:0
+                value:'0'
               }
             ]
           },
@@ -199,11 +199,11 @@ export default {
             dicData:[
               {
                 label:'是',
-                value:1
+                value:'1'
               },
               {
                 label:'否',
-                value:0
+                value:'0'
               }
             ],
             rules:[
@@ -223,10 +223,11 @@ export default {
   methods: {
     beforeOpen(done, type) {
       if (['edit', 'view'].includes(type)) {
+        console.log('form----------',this.form)
         done();
       }else if(['add'].includes(type)){
-        this.form.isLocal = 0
-        this.form.isThickness = 0
+        this.form.isLocal = '0'
+        this.form.isThickness = '0'
         done();
       }
     },
@@ -234,7 +235,7 @@ export default {
       console.log(row);
       let params = {
         qualityGrade:row.qualityGrade,
-        types:row.type,
+        types:row.types.join(','),
         isLocal:row.isLocal,
         isThickness:row.isThickness
       }
@@ -258,7 +259,7 @@ export default {
       let params = {
         id:row.id,
         qualityGrade:row.qualityGrade,
-        types:row.type.split(',')
+        types:row.types.split(',')
       }
       updateGualityGrade(params).then(
         () => {

src/views/productionTesting/productionQuality.vue

@@ -1269,15 +1269,15 @@ export default {
           this.vxeTableData.forEach(item =>{
             console.log('item--------------',item)
             if(item.item.specialType == '2' && (item.checkUserId == -1 || item.checkUserRealName == '')){
-              this.ydInterval = setInterval(() =>{
+              // this.ydInterval = setInterval(() =>{
                 refreshHardness().then(res =>{
                   console.log('res2--------------------------',res)
                   if (res.data.data.length > 0) {
                     item.checkValue = res.data.data[0].formatted_hardness
-                    clearInterval(this.ydInterval)
+                    // clearInterval(this.ydInterval)
                   }
                 })
-              },window.YINGDU_Trigger)
+              // },window.YINGDU_Trigger)
             }
           })
         }

src/views/qualityManagement/inspectionArchiving/auditFile/index.vue

@@ -105,9 +105,9 @@ export default {
             type: 'select',
             filterable: true,
             remote: true,
-            dicUrl:`/api/blade-desk/dsProcess/list?processName={{key}}`,
+            dicUrl:`/api/blade-desk/bsProcessSet/list?name={{key}}`,
             props:{
-              label: 'processName',
+              label: 'name',
               value: 'id',
               res: 'data.records',
             },

src/views/qualityManagement/inspectionArchiving/rbFilePreserve/addPreserve.vue

@@ -85,7 +85,7 @@
                     <el-option 
                     v-for="item in processList" 
                     :key="item.id" 
-                    :label="item.processName" 
+                    :label="item.name" 
                     :value="item.id"
                     ></el-option>
                 </el-select>
@@ -224,7 +224,7 @@ export default {
         if (query) {
             this.loading = true
             getProcessList({
-                processName:query
+                name:query
             }).then(res =>{
                 this.processList = res.data.data.records;
                 this.loading = false
@@ -234,7 +234,7 @@ export default {
             this.loading = true
             getProcessList({
                 size:9999,
-                count:1
+                current:1
             }).then(res =>{
                 this.processList = res.data.data.records;
                 this.loading = false

src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue

@@ -202,9 +202,9 @@ export default {
             type: 'select',
             filterable: true,
             remote: true,
-            dicUrl:`/api/blade-desk/dsProcess/list?processName={{key}}`,
+            dicUrl:`/api/blade-desk/bsProcessSet/list?name={{key}}`,
             props:{
-              label: 'processName',
+              label: 'name',
               value: 'id',
               res: 'data.records',
             },

src/views/warehouseManagement/leveragingManagement.vue

@@ -876,6 +876,7 @@ export default {
         endLeDate:this.query.leDate && this.query.leDate.length > 0 && this.query.leDate[1],
       }
       const {leDate,...searchParams} = params
+      console.log('sezrch------------',searchParams)
       getList({
         current:this.page.currentPage,
         size:this.page.pageSize,

src/views/zhgd-work/workReport/index.vue

@@ -16,10 +16,10 @@
           <el-form-item label="合格数量：" prop="workQty">
             <el-input-number
               :disabled="workPlanDto.notWorkQty - formData.scrapQty == 0"
-              v-model="formData.workQty"
+              v-model="workPlanDto.workQty"
               @change="handleChange"
               :min="0"
-              :max="workPlanDto.notWorkQty - formData.scrapQty"
+              :max="workPlanDto.notWorkQty - workPlanDto.scrapQty"
               label="请输入"
               @blur="scrapQtyBlur($event, 'workQty')"
             ></el-input-number>