缺陷修复

src/views/inboundOutboundManagement/glassCakeOutbound/index.vue

@@ -303,17 +303,19 @@ export default {
             width: 120,
             searchLabelWidth: 100,
             hide: true,
+            format:"YYYY-MM-DD",
+            valueFormat:"YYYY-MM-DD",
             type: "date",
             searchRange: true,
             startPlaceholder: "开始时间",
             endPlaceholder: "结束时间",
           },
-          // {
-          //   label: "预计使用时间",
-          //   prop: "estUseTime",
-          //   search: false,
-          //   width: 120,
-          // },
+          {
+            label: "预计使用时间",
+            prop: "estUseTime",
+            search: false,
+            width: 120,
+          },
           {
             label: "创建时间",
             prop: "createTime",

src/views/inboundOutboundManagement/materialIssuing.vue

@@ -370,6 +370,8 @@ export default {
                         label: '提请日期',
                         prop: 'crDate',
                         type: 'date',
+                        valueFormat:"YYYY-MM-DD",
+                        format:"YYYY-MM-DD",
                         searchRange: true,
                         startPlaceholder: '开始时间',
                         endPlaceholder: "结束时间",

src/views/inboundOutboundManagement/otherReceiving.vue

@@ -380,6 +380,8 @@ export default {
                         prop: 'inOutDate',
                         type: 'date',
                         searchRange: true,
+                        valueFormat:"YYYY-MM-DD",
+                        format: 'YYYY-MM-DD',
                         startPlaceholder: '开始时间',
                         endPlaceholder: "结束时间",
                         span: 8,
@@ -485,10 +487,16 @@ export default {
         },
         onLoad() {
             console.log('query--------',this.query)
+            let params = {
+                ...this.query,
+                startInOutDate:this.query.inOutDate && this.query.inOutDate.length != 0 && this.query.inOutDate[0],
+                endInOutDate:this.query.inOutDate && this.query.inOutDate.length != 0 && this.query.inOutDate[1],
+            }
+            if(params.inOutDate) delete params.inOutDate
             getOtherInList({
                 current:this.page.currentPage,
                 size:this.page.pageSize,
-                ...this.query
+                ...params
             }).then(res =>{
                 console.log('res---------------',res)
                 this.data = res.data.data.records

src/views/oem/oemProcess/index.vue

@@ -17,6 +17,7 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      :before-open="beforeOpen"
     >
       <template #menu-left>
         <el-button type="danger" @click="handleDelete">删除</el-button>
@@ -158,14 +159,14 @@ export default {
             type:'switch',
             span: 24,
             dicData:[
+              {
+                label:'否',
+                value:'0'
+              },
               {
                 label:'是',
                 value:'1'
               },
-              {
-                label:'否',
-                value:'0'
-              }
             ],
             rules: [
               {
@@ -196,6 +197,17 @@ export default {
         this.onLoad()
       }
     },
+    beforeOpen(done, type){
+      if(type == 'add'){
+        this.form = {
+          ...this.form,
+          manual:'0'
+        }
+        done()
+      }else{
+        done()
+      }
+    },
     handleDelete() {
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
@@ -232,6 +244,7 @@ export default {
     },
     rowSave(row, done, loading){
       row.processId = row.processIdStr
+      row.craftIds = typeof row.craftIds == 'string' ? row.craftIds : row.craftIds.join(',')
       addOutProcess(row).then(res =>{
         if(res.data.code == 200){
           this.$message.success('添加成功')
@@ -244,6 +257,7 @@ export default {
     },
     rowUpdate(row, index, done, loading){
       row.processId = row.processIdStr
+      row.craftIds = typeof row.craftIds == 'string' ? row.craftIds : row.craftIds.join(',')
       updateOutProcess(row).then(res =>{
         if(res.data.code == 200){
           this.$message.success('修改成功')

src/views/processManagement/processCapability.vue

@@ -140,6 +140,7 @@ export default {
         gridBtn: false,
         searchMenuPosition: "right",
         align: "center",
+        labelWidth:140,
 
         column: [
           {
@@ -193,7 +194,7 @@ export default {
           {
             label: "能力类型",
             span:24,
-            prop: "wtId",
+            prop: "wxLimit", 
             // bind: "bsWorkType.wtName",
             sortable: true,
             search: true,
@@ -221,6 +222,58 @@ export default {
               },
             ],
           },
+          {
+            label:"外协限制",
+            prop:"wtId",
+            type:"select",
+            span:24,
+            dicUrl: "/blade-system/dict/dictionary?code=WxLimit",
+            props: {
+              label: "dictValue",
+              value: "dictKey",
+            },
+          },
+          {
+            label:"厂内比例(%)",
+            prop:"inRate",
+            type: 'number',
+            span:24,
+            controls: false,
+            max:100,
+            rules: [
+              {
+                required: true,
+                message: "请输入厂内比例",
+                trigger: "change",
+              },
+            ],
+            change: (val) => {
+             console.log('val==========',val)
+             this.form.outRate = 100 - val.value
+            }
+          },
+          {
+            label:"外协比例(%)",
+            prop:"outRate",
+            type: 'number',
+            disabled:true,
+            span:24,
+            controls: false,
+            rules: [
+              {
+                required: true,
+                message: "请输入外协比例",
+                trigger: "change",
+              },
+            ],
+          },
+          {
+            label:"局部镀订单面积(dm²)",
+            prop:"localArea",
+            type: 'number',
+            span:24,
+            controls: false,
+          },
           {
             label: "修改时间",
             prop: "updateTime",
@@ -311,7 +364,7 @@ export default {
         }).then(() =>{
           saveProcessAbility({
             ids:this.selectionList.map(item => item.id),
-            wtId:this.slectForm.wtName,
+            wxLimit:this.slectForm.wtName,
           }).then((res) => {
             if(res.data.code === 200){
               this.$message.success('设置成功');
@@ -339,10 +392,13 @@ export default {
       const submitData = { ...row };
       // 处理空值，将空字符串转换为 -1
       if (submitData.wtId === '' || submitData.wtId === null || submitData.wtId === undefined) {
-        submitData.wtId = -1;
+        submitData.wtId = '';
       }
       if (submitData.bpsId === '' || submitData.bpsId === null || submitData.bpsId === undefined) {
-        submitData.bpsId = -1;
+        submitData.bpsId = '';
+      }
+      if (submitData.wxLimit === '' || submitData.wxLimit === null || submitData.wxLimit === undefined) {
+        submitData.wxLimit = '';
       }
       addProcessAbility(submitData).then(res =>{
         if(res.data.code == 200){
@@ -359,10 +415,13 @@ export default {
       const submitData = { ...row };
       // 处理空值，将空字符串转换为 -1
       if (submitData.wtId === '' || submitData.wtId === null || submitData.wtId === undefined) {
-        submitData.wtId = -1;
+        submitData.wtId = '';
       }
       if (submitData.bpsId === '' || submitData.bpsId === null || submitData.bpsId === undefined) {
-        submitData.bpsId = -1;
+        submitData.bpsId = '';
+      }
+      if (submitData.wxLimit === '' || submitData.wxLimit === null || submitData.wxLimit === undefined) {
+        submitData.wxLimit = '';
       }
       updateProcessAbility(submitData).then(res =>{
         if(res.data.code == 200){
@@ -478,6 +537,9 @@ export default {
         size:this.page.pageSize,
         ...searchParam
       }).then(res =>{
+        res.data.data.records.map(item => {
+          item.localArea = item.localArea == -1 ? '' : item.localArea
+        })
         this.data = res.data.data.records
         this.page.total = res.data.data.total
         this.loading = false

src/views/productionTesting/productionQuality.vue

@@ -319,7 +319,15 @@
           <template #default="scope"> {{scope.row.standard && scope.row.standard.name}} </template>
         </el-table-column>
         <el-table-column label="标准值" prop="trialStandard" align="center" width="150px">
-          <template #default="scope"> {{scope.row.standard && scope.row.standard.standardValue}}  {{'(' + scope.row.standard && scope.row.standard.downValue + '~' + scope.row.standard && scope.row.standard.upValue+ ')'}} </template>
+          <template #default="scope">
+            <!-- {{scope.row.standard && scope.row.standard.standardValue}}  
+            {{'(' + scope.row.standard && scope.row.standard.downValue + '~' + scope.row.standard && scope.row.standard.upValue+ ')'}}  -->
+            <span v-if="scope.row.standard">
+              {{scope.row.standard.standardValue}} 
+              <span v-if="scope.row.standard.downValue &&  scope.row.standard.upValue">{{'(' +  scope.row.standard.downValue + '~' +  scope.row.standard.upValue+ ')'}}</span>
+            </span>
+            <span v-else></span>
+          </template>
         </el-table-column>
         <!-- <el-table-column label="上下限" prop="trialStandard"  align="center"></el-table-column>、
         <el-table-column label="下限" prop="trialStandard"  align="center"></el-table-column> -->
@@ -1316,6 +1324,7 @@ export default {
         this.vxeTableData2 = res.data.data
       })
     },
+    // 查看详情
     handleResult(row) {
       console.log('row------------------',row)
       this.checkedId = row.id
@@ -1330,6 +1339,10 @@ export default {
         this.dialogData = res.data.data.orderInfo;
         this.dialogData.ppsName = res.data.data.processName;
         this.remindMsgList = res.data.data.remindMsgList;
+        // res.data.data.wpItemList[0].standard = {
+        //   standardValue:null,
+        //   downValue:null
+        // }
         this.vxeTableData = res.data.data.wpItemList;
         this.getSameList(row.id)
         if(this.dialogData.ppsName != '烧结包装防护'){

src/views/statisticalAnalysis/warehouseAnalysis/inOutBoundReport.vue

@@ -424,11 +424,12 @@ export default {
                 startInOutDate:this.query.inOutDate && this.query.inOutDate.length != 0 && this.query.inOutDate[0],
                 endInOutDate:this.query.inOutDate && this.query.inOutDate.length != 0 && this.query.inOutDate[1],
             }
-            const {inOutDate,...validateParams} = params
+            // const {inOutDate,...validateParams} = params
+            if(params.inOutDate) delete params.inOutDate
             getList({
                 current:this.page.currentPage,
                 size:this.page.pageSize,
-                ...validateParams
+                ...params
             }).then(res =>{
                 console.log('res-----------------',res)
                 this.data = res.data.data.records

src/views/statisticalAnalysis/warehouseAnalysis/inventorySummary.vue

@@ -673,11 +673,12 @@ export default {
                 startInOutDate:this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[0],
 	            endInOutDate:this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[1]
             }
-            const {createTime,...invalideParams} = params
+            // const {createTime,...invalideParams} = params
+            if(params.createTime) delete params.createTime
             getList({
                 current:this.page.currentPage,
                 size:this.page.pageSize,
-                ...invalideParams
+                ...params
             }).then(res =>{
                 this.data = res.data.data.records
                 this.page.total = res.data.data.total