From b6d19d5b24b7ba6dfc7880a2e3a9908fa140a0d3 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Tue, 22 Aug 2023 11:55:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouseWarehouseingAddReceipt.vue       | 20 ++++++++++++-------
 .../warehouseWarehousingEntry.vue             |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
index 40dd2e40..1d85da86 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
@@ -159,14 +159,14 @@
           <el-table-column prop="menu" label="操作" :width="300" align="center" v-if="!view || this.$route.query.type != '3'">
             <template #="{row}">
 <!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
-              <el-button type="primary" text icon="el-icon-edit" @click="handleEditOwn(row)">编辑</el-button>
-              <el-button type="primary" text icon="el-icon-delete" @click="rowDelOwn(row)">删除</el-button>
+              <el-button type="primary" text icon="el-icon-edit" @click="handleEditOwn(row)" :disabled = typeView>编辑</el-button>
+              <el-button type="primary" text icon="el-icon-delete" @click="rowDelOwn(row)" :disabled = typeView>删除</el-button>
 <!--              <el-button type="primary" text icon="el-icon-setting" @click="handleDrawer(row)">子表配置</el-button>-->
             </template>
           </el-table-column>
         </el-table>
       </el-row>
-      <div style="line-height: 20px;text-align:center;padding-top: 10px">
+      <div style="line-height: 20px;text-align:center;padding-top: 10px" v-if="!typeView">
           <span class="dialog-footer">
             <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit" :disabled="view && !this.$route.query.type == '3'">提 交</el-button>
 <!--            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>-->
@@ -343,6 +343,7 @@ export default {
       loading: false,
       // 是否为查看模式
       view: false,
+      typeView: false,
       // 查询信息
       query: {},
       // 分页信息
@@ -436,6 +437,7 @@ export default {
       handler(newVal, oldVal) {
         console.log(newVal, oldVal);
         console.log("$route.query.id",this.$route.query.type);
+        this.selectionClear();
         this.getOwnDeliver();
       },
       deep: true,
@@ -505,12 +507,14 @@ export default {
         if(!!ty && ty == "2"){
           this.view = false;
         }else{
+          this.typeView = true;
           this.view = true;
         }
 
       }else{
         this.view = false;
         this.loading = false;
+        this.typeView = false;
       }
     },
     //物品名称
@@ -801,7 +805,7 @@ export default {
       this.$refs.form.validate(valid=>{
         if (valid) {
           if (!this.form.id) {
-            console.log("this.form",this.form);
+            // console.log("this.form111",this.form);
             if(this.data.length > 0){
               this.form.list = this.data;
               add(this.form).then(() => {
@@ -827,7 +831,7 @@ export default {
             // if(parseInt(this.$route.query.type) == 3){
             //
             // }
-            console.log("this.form",this.form);
+            // console.log("this.form222",this.form);
             if(!!this.form.totalInput && parseInt(this.form.totalInput) == '-1'){
               this.form.totalInput = null;
             }
@@ -839,7 +843,7 @@ export default {
                 type: "success",
                 message: "操作成功!"
               });
-              this.form = {};
+              // this.form = {};
             })
           }
 
@@ -934,7 +938,9 @@ export default {
     },
     selectionClear () {
       this.selectionList = [];
-      this.$refs.table.clearSelection();
+      this.form = {};
+      this.data = [];
+      // this.$refs.table.clearSelection();
     },
     currentChange (currentPage) {
       this.page.currentPage = currentPage;
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
index 73cc8832..3219a64a 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
@@ -154,7 +154,7 @@
         </avue-form>
       </el-dialog>
       <el-drawer
-        title="物品操作"
+        title="物品详细"
         append-to-body
         size="60%"
         v-model="drawer"