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

src/views/basicData/teamManagement.vue

@@ -23,9 +23,12 @@
         <el-button type="danger" icon="el-icon-delete" @click="handleDelete"
           >删 除
         </el-button>
-        <el-button type="success" icon="el-icon-upload" @click="handleImport"
+        <!-- <el-button type="success" icon="el-icon-upload" @click="handleImport"
           >导入
-        </el-button>
+        </el-button> -->
+      </template>
+      <template #menu-right>
+        <el-button type="primary"  @click="handleImport">导入</el-button> 
       </template>
       <template #menu="scope">
         <el-button type="text" @click="setCrew(scope.row)">设置班组人员</el-button>

src/views/basicData/workCenter.vue

@@ -355,11 +355,16 @@ export default {
             // ],
           },
           {
-            label: "",
+            label: "是否检验标记",
             prop: "checkout",
-            type: "checkbox",
+            type: "switch",
-            dicData: [{ label: "检验标记", value: 1 }],
+            // type: "checkbox",
-            span: 8,
+            dicData: [
+              { label:"否",  value:0},
+              { label: "是", value: 1 },
+            ],
+            // dicData: [{ label: "检验标记", value: 1 }],
+            span: 24,
             hide: true,
             overflow: true,
             search: false,
@@ -372,11 +377,16 @@ export default {
             // ],
           },
           {
-            label: "",
+            label: "是否镀后标记",
             prop: "whetherPlate",
-            type: "checkbox",
+            // type: "checkbox",
-            dicData: [{ label: "镀后标记", value: 1 }],
+            type: "switch",
-            span: 8,
+            dicData: [
+              { label:"否",  value:0},
+              { label: "是", value: 1 },
+            ],
+            // dicData: [{ label: "镀后标记", value: 1 }],
+            span: 24,
             hide: true,
             overflow: true,
             search: false,
@@ -389,11 +399,16 @@ export default {
             // ],
           },
           {
-            label: "",
+            label: "是否大批量",
             prop: "bigBatch",
-            type: "checkbox",
+            // type: "checkbox",
-            dicData: [{ label: "是否大批量", value: 1 }],
+            type:"switch",
-            span: 8,
+            dicData:[
+              { label:"否",  value:0},
+              { label: "是", value: 1 },
+            ],
+            // dicData: [{ label: "是否大批量", value: 1 }],
+            span: 24,
             hide: true,
             overflow: true,
             search: false,
@@ -436,9 +451,15 @@ export default {
         console.log('form',this.form)
         this.form.jcId = this.form.jcId + ''
         this.form.leaderUser = this.form.leaderUser + ''
-        this.form.checkout = this.form.checkout == 1 ? [1] : []
+        // this.form.checkout = this.form.checkout == 1 ? [1] : []
-        this.form.bigBatch = this.form.bigBatch == 1 ? [1] : []
+        // this.form.bigBatch = this.form.bigBatch == 1 ? [1] : []
-        this.form.whetherPlate = this.form.whetherPlate == 1 ? [1] : []
+        // this.form.whetherPlate = this.form.whetherPlate == 1 ? [1] : []
+
+        this.form.checkout = this.form.checkout == 1 ? 1 : 0
+        this.form.bigBatch = this.form.bigBatch == 1 ? 1 : 0
+        this.form.whetherPlate = this.form.whetherPlate == 1 ? 1 : 0
+        
+
         getAllUser({current:1,size:300}).then(res => {
           this.leaderUsers = res.data.data.records
           let tmp = this.leaderUsers.find(item => item.id == this.form.leaderUser)
@@ -458,11 +479,19 @@ export default {
       }
     },
     rowSave(row, done, loading){
+      console.log('row----------',row)
+      // let params = {
+      //   ...row,
+      //   checkout:row.checkout.length != 0 ? 1 : 0,
+      //   bigBatch:row.bigBatch.length != 0 ? 1 : 0,
+      //   whetherPlate:row.whetherPlate.length != 0 ? 1 : 0,
+      // }
+
       let params = {
         ...row,
-        checkout:row.checkout.length != 0 ? 1 : 0,
+        checkout:row.checkout == 1 ? 1 : 0,
-        bigBatch:row.bigBatch.length != 0 ? 1 : 0,
+        bigBatch:row.bigBatch == 1 ? 1 : 0,
-        whetherPlate:row.whetherPlate.length != 0 ? 1 : 0,
+        whetherPlate:row.whetherPlate == 1 ? 1 : 0,
       }
 
       addWorkCenter(params).then(res =>{
@@ -474,12 +503,20 @@ export default {
       })
     },
     rowUpdate(row, index, done, loading){
+      // let params = {
+      //   ...row,
+      //   checkout:row.checkout.length != 0 ? 1 : 0,
+      //   bigBatch:row.bigBatch.length != 0 ? 1 : 0,
+      //   whetherPlate:row.whetherPlate.length != 0 ? 1 : 0,
+      // }
+
       let params = {
         ...row,
-        checkout:row.checkout.length != 0 ? 1 : 0,
+        checkout:row.checkout == 1 ? 1 : 0,
-        bigBatch:row.bigBatch.length != 0 ? 1 : 0,
+        bigBatch:row.bigBatch == 1 ? 1 : 0,
-        whetherPlate:row.whetherPlate.length != 0 ? 1 : 0,
+        whetherPlate:row.whetherPlate == 1 ? 1 : 0,
       }
+
       updateWorkCenter(params).then(res =>{
         if(res.data.code === 200){
           this.$message.success('修改成功');

src/views/exemption/components/addDialog.vue

@@ -172,6 +172,7 @@ export default {
             type: 'upload',
             multiple: true,
             span: 24,
+            limit: 1,
             propsHttp: {
               res: 'data',
               url: 'link',
@@ -217,7 +218,8 @@ export default {
     uploadDelete(file, column) {
       console.log('uploadDelete', file, column);
       this.attachLink = '';
-      return true;
+      this.formData.attachLink = []
+      // return true;
     },
     uploadExceed(limit, files, fileList, column) {
       this.$message.error('最多只能上传一个文件');

src/views/productionDisposition/hearingDialog.vue

@@ -70,10 +70,10 @@
 
         <el-descriptions v-if="testType == 2" class="margin-top" title="质量信息" border :column="3" label-width="110" style="margin-bottom: 24px;">
             <el-descriptions-item label="比例:">
-                <el-input v-model="detailInfo.scale" placeholder="请输入" style="width: 400px;" :disabled="type == 'view'"/>
+                <el-input v-model="insideInfo.scale" placeholder="请输入" style="width: 400px;" :disabled="type == 'view'"/>
             </el-descriptions-item>
             <el-descriptions-item label="不合格数:">
-                <el-input v-model="detailInfo.unqualifiedQty" placeholder="请输入" style="width: 400px;" :disabled="type == 'view'"/>
+                <el-input v-model="insideInfo.unqualifiedQty" placeholder="请输入" style="width: 400px;" :disabled="type == 'view'"/>
             </el-descriptions-item>
             <el-descriptions-item label="处置类型">
                 <el-radio-group v-model="disposalType" :disabled="type == 'view'">
@@ -82,10 +82,10 @@
                 </el-radio-group>
             </el-descriptions-item>
             <el-descriptions-item label="返修数量:">
-                <el-input v-model="detailInfo.reDoNum" placeholder="请输入" style="width: 400px;" :disabled="type == 'view' || disposalType == 2"/>
+                <el-input v-model="insideInfo.reDoNum" placeholder="请输入" style="width: 400px;" :disabled="type == 'view' || disposalType == 2"/>
             </el-descriptions-item>
             <el-descriptions-item label="报废数量:">
-                <el-input v-model="detailInfo.scrapNum" placeholder="请输入" style="width: 400px;" :disabled="type == 'view' || disposalType == 1"/>
+                <el-input v-model="insideInfo.scrapNum" placeholder="请输入" style="width: 400px;" :disabled="type == 'view' || disposalType == 1"/>
             </el-descriptions-item>
             <el-descriptions-item label="">
                 <el-checkbox-group v-model="checkList" :disabled="type == 'view'">
@@ -335,6 +335,7 @@ export default {
             errorBigArr:[],     //问题大类
             errorSmallArr:[],   //问题小类
             detailInfo:{},
+            insideInfo:{},
             checkList:[],
             historyList:[],
             checkWoId:'',       //已选择的历史订单id
@@ -593,6 +594,9 @@ export default {
         },
         changeType(val){
             console.log('val---------------------',val)
+            if(val == 2){
+                this.disposalType = 1
+            }
         },
         submit(val){
             this.detailInfo.bizType = this.testType == 1 ? 3 : this.testType == 2 ? this.disposalType == 1 ? 1 : 2 : ''
@@ -615,24 +619,30 @@ export default {
         },
         // 内部审理提交
         submitInside(){
-            // if(this.disposalType == 1){
+            console.log('inside--------------',this.insideInfo)
-            //     let params = {
+            console.log('detail--------------',this.detailInfo)
 
-            //     }
+            let params = {
-            // }
+                bizType:this.testType == 1 ? 3 : this.testType == 2 ? this.disposalType == 1 ? 1 : 2 : '',
-            // this.detailInfo = {
+                isBatProblem:this.checkList.includes('isBatProblem') ? 1 : 0,
-            //     ...this.detailInfo,
+                isClassicProblem:this.checkList.includes('isClassicProblem') ? 1 : 0,
-            //     bizType:this.testType == 1 ? 3 : this.testType == 2 ? this.disposalType == 1 ? 1 : 2 : ''
+                isLowError:this.checkList.includes('isLowError') ? 1 : 0,
-            // }
+                isQualityProblem:this.checkList.includes('isQualityProblem') ? 1 : 0,
-            console.log('check===============',this.checkList.includes('isQualityProblem'))
+                submitType:10,
-            this.detailInfo.bizType = this.testType == 1 ? 3 : this.testType == 2 ? this.disposalType == 1 ? 1 : 2 : ''
+                ...this.insideInfo
-            this.detailInfo.isBatProblem = this.checkList.includes('isBatProblem') ? 1 : 0
+            }
-            this.detailInfo.isClassicProblem = this.checkList.includes('isClassicProblem') ? 1 : 0
+
-            this.detailInfo.isLowError = this.checkList.includes('isLowError') ? 1 : 0
+            console.log('params------------',params)
-            this.detailInfo.isQualityProblem = this.checkList.includes('isQualityProblem') ? 1 : 0
+
-            this.detailInfo.submitType = 10
+            // console.log('check===============',this.checkList.includes('isQualityProblem'))
-            console.log('detailInfo-----------------',this.detailInfo)
+            // this.detailInfo.bizType = this.testType == 1 ? 3 : this.testType == 2 ? this.disposalType == 1 ? 1 : 2 : ''
-            createProductionDisposition(this.detailInfo).then(res =>{
+            // this.detailInfo.isBatProblem = this.checkList.includes('isBatProblem') ? 1 : 0
+            // this.detailInfo.isClassicProblem = this.checkList.includes('isClassicProblem') ? 1 : 0
+            // this.detailInfo.isLowError = this.checkList.includes('isLowError') ? 1 : 0
+            // this.detailInfo.isQualityProblem = this.checkList.includes('isQualityProblem') ? 1 : 0
+            // this.detailInfo.submitType = 10
+            // console.log('detailInfo-----------------',this.detailInfo)
+            createProductionDisposition(params).then(res =>{
                 if(res.data.code == 200){
                     this.$message.success('提交成功')
                     this.closeDialog(true)

src/views/productionDisposition/index.vue

@@ -493,7 +493,7 @@ export default {
                     },
                     {
                         label: '审理状态',
-                        prop: 'reviewStatus',
+                        prop: 'reviewStatusName',
                         addDisplay: false,
                         editDisplay: false,
                         span: 24,

src/views/qualityManagement/reviewFormMess/options.js

@@ -236,7 +236,7 @@ export const erpOption = {
     calcHeight: 32,
     simplePage: false,
     searchShow: true,
-    searchMenuSpan: 6,
+    searchMenuSpan: 18,
     searchIcon: true,
     searchIndex: 3,
     tree: false,