From 13f3799fc43eae5f670c72a675b1fb9326f5a102 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 02 十一月 2023 12:37:52 +0800
Subject: [PATCH] 	modified:   src/views/quality/finishedProductInspection/finishedProduct-form.vue 	modified:   src/views/quality/rawMaterial/rawMaterial-form.vue

---
 src/views/quality/rawMaterial/rawMaterial-form.vue |  128 ++++++++++++++++++++++++++++--------------
 1 files changed, 84 insertions(+), 44 deletions(-)

diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 0966edf..7a2d085 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -3,7 +3,8 @@
     <div class="page-header">
       <div class="header-left">
         <a @click="$router.go(-1)"><i class="icon-btn-back"></i></a>
-        <h2>缂栬緫-鍘熸潗鏂欐楠�</h2>
+        <h2 v-if="resultVal!=null && dataForm.id!=null">鏌ョ湅-鍘熸潗鏂欐楠�</h2>
+        <h2 v-else>缂栬緫-鍘熸潗鏂欐楠�</h2>
       </div>
       <div class="btn-group header-right">
         <el-button @click="save()" v-if="this.dataForm.id==null">淇濆瓨</el-button>
@@ -21,10 +22,11 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="闆朵欢鍙�" prop="code">
-                <el-input v-model="dataForm.code">
+                <el-input v-model="dataForm.code" :disabled="resultVal!=null && dataForm.id!=null">
                   <el-button
                     slot="append"
                     icon="el-icon-search"
+                    :disabled="resultVal!=null && dataForm.id!=null"
                     @click="queryCode()"></el-button>
                 </el-input>
                 </el-form-item>
@@ -69,19 +71,19 @@
                 </el-col>
                 <el-col :span="6">
                   <el-form-item label="鏁伴噺" prop="number">
-                      <el-input v-model="dataForm.number" />
+                      <el-input v-model="dataForm.number" :disabled="resultVal!=null" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
                   <el-form-item label="鎶ユ鏃ユ湡" prop="createTime" v-if="dataForm.id!=null">
-                      <el-input v-model="dataForm.createTime" />
+                      <el-input v-model="dataForm.createTime" disabled />
                   </el-form-item>
                 </el-col>
             </el-row>
             <el-row>
               <el-col :span="6">
                 <el-form-item label="鎶ユ浜�" prop="createUser" v-if="dataForm.id!=null">
-                      <el-input v-model="dataForm.createUser" />
+                      <el-input v-model="dataForm.createUser" disabled />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -92,9 +94,9 @@
             <el-col :span="19">妫�楠岄」鐩�</el-col>
             <el-col :span="5">
                 <div style="width:100%;text-align: right;">
-                    <el-button v-show="dataForm.id==null" size="small" @click="clickAddLine">娣诲姞妫�楠岃</el-button>
-                    <el-button size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
-                    <el-button size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
+                    <el-button v-if="dataForm.id==null" size="small" @click="clickAddLine">娣诲姞妫�楠岃</el-button>
+                    <el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
+                    <el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
                 </div>
             </el-col>
         </el-row>
@@ -131,17 +133,18 @@
                     <template slot-scope="scope">
                       <el-tooltip :disabled="scope.row.equipmentId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�"
                         placement="top-start">
-                        <el-input :disabled="scope.row.equipmentId == null" v-model="scope.row.testValueList[index]"
-                          @blur="updateTestValue(scope.row)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+                        <el-input :disabled="scope.row.equipmentId == null ||  (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.testValueList[index]"
+                          @blur="updateTestValue(scope.row,index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
                       </el-tooltip>
                     </template>
                   </el-table-column>
                   <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="260">
                     <template slot-scope="scope">
-                      <el-select style="width:100%" v-model="scope.row.equipmentId" filterable @change="updateDevice(scope.row)">
-                          <el-option v-for="(item,index) in deviceList" 
-                          :key="index" :value="item.id" :label="item.number +'-'+ item.name"></el-option>
-                      </el-select>
+                        <el-select :disabled="resultVal!=null && dataForm.id!=null" style="width:100%" 
+                        v-model="scope.row.equipmentId" filterable @change="updateDevice(scope.row,scope.$index)">
+                            <el-option v-for="(item,index) in deviceList" 
+                            :key="index" :value="item.id" :label="item.number +'-'+ item.name"></el-option>
+                        </el-select>
                     </template>
                   </el-table-column>
                   <el-table-column fixed="right" v-if="dataForm.id != null" prop="testState" label="缁撹" min-width="150">
@@ -180,7 +183,7 @@
                 </el-table-column>
                 <el-table-column  label="鎿嶄綔">
                     <template>
-                        <el-button type="text" @click="submitSave()" size="small">涓婃姤</el-button>
+                        <el-button type="text" :disabled="resultVal!=null && dataForm.id!=null" @click="showDialog()" size="small">涓婃姤</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -189,6 +192,25 @@
       </div>
     </div>
     <rawMaterialPartDialog :paramObj="paramObj" :currshowlist.sync="showPart"  @listenToPartEvent="selectPart" />
+    <el-dialog
+      title="涓婃姤"
+      :visible.sync="dialogVisible"
+      width="30%" class="l-mes">
+      <el-row>
+        <el-col>
+          <span>涓嶅悎鏍兼暟閲�:</span>
+          <el-input type="number" v-model="unqualifiedNum" placeholder="璇疯緭鍏ヤ笉鍚堟牸鏁伴噺"/>
+        </el-col>
+        <el-col>
+          <span>瀹炴鏁伴噺:</span>
+          <el-input type="number" placeholder="璇疯緭鍏ュ疄妫�鏁伴噺" v-model="fiedNum"/>
+        </el-col>
+      </el-row>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="submitSave()">纭� 瀹�</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -199,8 +221,6 @@
   getObj,
   updateRawInsProduct,
   updateRawInspectsById,
-  chooseIFS,
-  selectHisByCode,
   updateDeviceById, } from '@/api/quality/rawMaterial'
   import rawMaterialPartDialog from '@/views/common/rawMaterial-part'
 export default {
@@ -210,6 +230,10 @@
     },
     data(){
         return{
+            fiedNum: null,
+            unqualifiedNum: null,
+            dialogVisible:false,
+            resultVal: null,
             projectList: [],
             paramObj: {},
             IFSData: [],
@@ -259,11 +283,21 @@
     },
     mounted(){
       this.dataForm.id = this.$route.query.id
+      this.resultVal = this.$route.query.resultVal
+      if(this.resultVal == null){
+        let val = sessionStorage.getItem("raw-resultVal-"+this.dataForm.id)
+        val == undefined ? null : this.resultVal=val
+      }
       this.init()
       this.getDeviceList()
     },
     watch:{
-
+      dialogVisible(newVal){
+        if(newVal){
+          this.unqualifiedNum = null
+          this.fiedNum = null
+        }
+      }
     },
     methods:{
       changeName(index,row){
@@ -285,7 +319,7 @@
           this.dataForm.supplier = param.supplier
           this.dataForm.number = param.number
           this.dataForm.message = param.message
-          this.projectList = param.rawInsProducts
+          this.projectList = param.rawInsProducts == null ? [] : param.rawInsProducts
         }
       },
       queryCode(){
@@ -294,38 +328,41 @@
         }
         this.showPart = true
       },
-      updateDevice(row){
+      updateDevice(row,index){
         if(this.dataForm.id != null){
           updateDeviceById({equiomentId:row.equipmentId,rpId:row.rpId}).then(res=>{
+            this.list[index].testValue = ''
+            this.list[index].testState = null
+            this.list[index].testValueList = []
           }).catch(error=>{
             console.log(error)
           })
         }
       },
-      submitSave(){
+      showDialog(){
         let pro = this.list.filter(item => {
           return item.testState == 0;
         })
         if (pro.length > 0) {
-          this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
-            confirmButtonText: '纭畾',
-            cancelButtonText: '鍙栨秷',
-            inputPattern: /^\d+$/,
-            inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
-          }).then(({ value }) => {
-            let data = {
-              id: this.dataForm.id,
-              number: value
-            }
-            updateRawInspectsById(data).then(res => {
-              this.$message.success("涓婃姤鎴愬姛");
-            });
-          }).catch(() => {});
+          this.dialogVisible = true
         }else{
-          updateRawInspectsById({id:this.dataForm.id,number:0}).then(res => {
-          this.$message.success("涓婃姤鎴愬姛");
-        });
+          this.submitSave()
         }
+      },
+      //涓婃姤
+      submitSave(){
+        let data = {
+          id: this.dataForm.id,
+          number: this.unqualifiedNum,
+          toLocationNo: this.fiedNum
+        }
+        updateRawInspectsById(data).then(res => {
+          if(res.data.code == 0){
+            sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,res.data.data)
+            this.$message.success("涓婃姤鎴愬姛");
+            this.dialogVisible = false
+          }
+        });
         this.init()
       },
       addTeatValueColumn(){
@@ -358,8 +395,9 @@
           }
         }
       },
-      updateTestValue(row){
-        if(row.rpId == null){
+      updateTestValue(row,index){
+        console.log(row,index)
+        if(row.rpId == null || row.testValueList[index]==null){
           return
         }
         let obj = {
@@ -399,12 +437,13 @@
               let arr = []
               if(item.testValue != undefined ){
                 arr = item.testValue.split(",")
-                this.empiricalValueAdd = arr.length
-              }else{
-                this.empiricalValueAdd = 1
+                if(arr.length > this.empiricalValueAdd){
+                  this.empiricalValueAdd = arr.length
+                }
               }
               this.list.push({
                 equipmentId: item.equiomentId,
+                deviceName: item.deviceName,
                 name: item.rpName,
                 required: item.required,
                 testValue: item.testValue,
@@ -418,7 +457,7 @@
               code: data.code,
               name: data.name,
               userName: Array.from(new Set(userNameList)).join(','),
-              judgeState: data.judgeState
+              judgeState: this.resultVal==null?null:this.resultVal
             }]
           }).catch(error=>{
             this.$message.error("鑾峰彇澶辫触",error)
@@ -436,6 +475,7 @@
         })
         addRawInspects(data).then(res=>{
             this.$message.success("淇濆瓨鎴愬姛")
+            this.$router.go(-1)
         }).catch(error=>{
           this.$message.error(error)
         })

--
Gitblit v1.9.3