From e06313b6dba4774aef0924f342f13e8433f8d6f6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 01 十二月 2023 15:32:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/quality/Packaging_ledger/index.vue |   89 +++++++++++++++++++++++++++-----------------
 1 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index e8f7d18..f9af4e3 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -9,7 +9,7 @@
             :prelang="prelang"
             :ajaxFun="ajaxFun"
             :options="options" 
-            @handleSelectionChange="handleCurrentChange"
+            @currentChange="handleCurrentChange"
             ref="processconfiguration"
             >
         <template #toolbar></template>
@@ -20,7 +20,7 @@
                 <div slot="header">
                 <el-row>
                     <el-col :span="8">
-                    <span>鏍囧噯鍙傛暟</span>
+                    <span>瑁呯鏄庣粏</span>
                     </el-col>
                     <el-col :span="8" :offset="4">
                     <!-- <el-button
@@ -53,7 +53,7 @@
               :data="testStandardParams"
               id="testStandardParamTable"
               ref="testStandardParam"
-              :default-sort="{ prop: 'index' }"
+            
               highlight-current-row
               height="700"
               style="width: 100%"
@@ -62,7 +62,7 @@
               stripe
             >
               <el-table-column
-                prop="index"
+                type ="index"
                 label="搴忓彿"
                 align="center"
                 width="50"
@@ -92,12 +92,12 @@
               </el-table-column>
               <el-table-column
                 label="鏁伴噺"
-                prop="parameterFormat"
+                prop="number"
                 align="center"
                 width="80"
               >
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.parameterFormat"></el-input>
+                  <el-input v-model="scope.row.number"></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="鍗曚綅" prop="unit" align="center" />
@@ -118,7 +118,7 @@
         <!-- 鏂板 -->
         <packfrom
         :currshowlist.sync="addOrUpdateVisible"
-        >
+        @refreshDataList="getData">
         </packfrom>
         <packfromadd
         :currshowlist.sync="increase"
@@ -131,13 +131,14 @@
 </template>
 
 <script>
-import { pagedata,dropById,list,saveList,deledata} from '@/api/quality/Packaging_ledger'
+import { pagedata,dropById,list,saveList,deledata,sAuditstatus} from '@/api/quality/Packaging_ledger'
 import ttable from '@/views/common/ztt-table.vue'
 import packfrom from './pack-from.vue'
 import packfromadd from './pack-fromadd.vue'
 export default {
     data(){
         return {
+          dataway:{},
           goid:'',
           testStandardParams: [],
           packageBoxId:{},
@@ -153,7 +154,8 @@
                 border: true, // 鏄惁鏈夌旱鍚戣竟妗�
                 lazy: false, // 鏄惁闇�瑕佹噿鍔犺浇
                 fit: true, // 鍒楃殑瀹藉害鏄惁鑷拺寮�
-                multiSelect: true, //
+                multiSelect: false, //
+                isEdit:false,
                 seqNo: true,
                 isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
                 isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
@@ -236,17 +238,17 @@
                 ],
                 operator: [
                     {
+                      text: '妫�楠�',
+                      icon: 'el-icon-delete',
+                      type: 'text',
+                      size: 'small',
+                      fun: this.check
+                    },{
                       text: '鍒犻櫎',
                       icon: 'el-icon-delete',
                       type: 'text',
                       size: 'small',
                       fun: this.deleteHandle
-                    },{
-                      text: 'xx',
-                      icon: 'el-icon-delete',
-                      type: 'text',
-                      size: 'small',
-                      // fun: this.deleteHandle
                     }
                   ],
                   operatorConfig: {
@@ -264,18 +266,15 @@
         packfromadd
         },
         watch: {
-          // renovate() {
-          //   if (this.innerVisible = false) {
-          //     this.$nextTick(() => {
-          //       this.getData()
-          //     })
-          //   }
-          // }
+
       },
     methods: {
        // 鑾峰彇鏁版嵁鍒楄〃
       getData() {
         this.$refs.processconfiguration.refreshData()
+      },
+      wayRenovate(){
+        this.getData()
       },
       //add
       addOrUpdateHandle(){
@@ -285,48 +284,70 @@
       deleteHandle(row){
         dropById({id:row.id}).then((res) =>{
           this.getData()
-          this.$message.error('鍒犻櫎鎴愬姛')
+          this.$message.success('鍒犻櫎鎴愬姛')
         })
       },
       handleCurrentChange(row){
-        console.log(row,"id");
+        console.log(row,"涓�琛�");
+        this.dataway = row
         this.packageBoxId = {
-          packageBoxId:row[0].id
+          packageBoxId:row.id
         }
-        this.goid = row[0].id
-        list({packageBoxId:row[0].id}).then((res) =>{
+        this.goid = row.id
+        this.rightquery()
+      },
+      rightquery(){
+        list({packageBoxId:this.goid}).then((res) =>{
           console.log(res,"nihaoa");
           this.testStandardParams = res.data.data
         })
       },
       //璇︽儏娣诲姞
       relateOperationParam(){
-        this.increase = true
+        if (this.dataway.state == "鏈姤妫�") {
+            this.increase = true
+        }else{
+          this.$message.error('璇峰厛閫夋嫨鍖呰椤圭洰')
+        }
       },
       preserve(datalist){
-        console.log(datalist);
         this.testStandardParams = datalist
 
       },
+      //鍙宠竟淇濆瓨
       addpreserve(){
         console.log(this.testStandardParams,"淇濆瓨鏁版嵁");
          this.testStandardParams.forEach(el => {
               el.packageBoxId =this.goid
          });
-        console.log(this.testStandardParams,"niaho");
         saveList(this.testStandardParams).then((res) =>{
-          console.log(res,"淇濆瓨鐨�");
+          console.log(res,"淇濆瓨鎴愬姛");
           this.$message.success('淇濆瓨鎴愬姛')
-          this.testStandardParams
+          this.rightquery()
         })
       },
+      //鍒犻櫎
       deleteadd(row){
           console.log(row,"");
           deledata({id:row.id}).then((res)=>{
           this.$message.success('鍒犻櫎鎴愬姛')
-          this.testStandardParams
+          this.rightquery()
           })
-      }
+      },
+      //瀹℃牳
+      check(row){
+        console.log(row,"瀹℃牳");
+        let packageBox = {
+                id:row.id,
+                packageNo:row.packageNo,
+                contractNo:row.contractNo,
+                customerId:row.customerId,
+        }
+        sAuditstatus(packageBox).then((res) =>{
+          this.getData()
+          this.$message.success('妫�楠屾垚鍔�')
+        })
+      },
     },
     computed: {
   },

--
Gitblit v1.9.3