From 9f0e7f0fb9d56f38f3e194c09d0071a29daa6fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 22 May 2023 14:46:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E4=BD=BF=E7=94=A8=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/product.vue       |  2 +-
 src/views/basic/product/productEdit.vue   | 35 +++++++++++++----------
 src/views/inout/muti/ioOrderMutiAudit.vue |  2 --
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index a0956e4e..d09a965b 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -662,7 +662,7 @@
                             splaceholder="请输入内容"
                             :disabled="useNumEnable"
                             type="number"
-                            v-model="editQuery.useNum"
+                            v-model="editQuery.zdcfsycs"
                           ></el-input>
                         </div>
                       </el-col>
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 47a0bbca..9dcbaf78 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -322,52 +322,52 @@
             <el-divider></el-divider>
             <el-row>
               <el-col span="5">
-                <span class="sptext">最小包装可使用次数</span>
+                <span class="sptext">多次/重复使用耗材</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable"
-                          type="number" v-model="editQuery.useNum"></el-input>
+                <el-select v-model="editQuery.useMuti" style="width: 65%" @change="setZdcfsycs" placeholder="状态" clearable>
+                  <el-option label="是" :value="true"></el-option>
+                  <el-option label="否" :value="false"></el-option>
+                </el-select>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">最小包装可使用次数</span>
+                <span class="sptext">多次/重复使用耗材</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
             <el-row>
               <el-col span="5">
-                <span class="sptext">启用使用单元</span>
+                <span class="sptext">最小包装可使用次数</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="editQuery.isUseDy" style="width: 65%"
-                           :disabled="editQuery.useMuti==true "
-                           placeholder="状态" clearable>
-                  <el-option label="是" :value="true"></el-option>
-                  <el-option label="否" :value="false"></el-option>
-                </el-select>
+                <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="!editQuery.useMuti"
+                          type="number" v-model="editQuery.zdcfsycs"></el-input>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">启用使用单元</span>
+                <span class="sptext">最小包装可使用次数</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
             <el-row>
               <el-col span="5">
-                <span class="sptext">多次/重复使用耗材</span>
+                <span class="sptext">启用使用单元</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="editQuery.useMuti" style="width: 65%" placeholder="状态" clearable>
+                <el-select v-model="editQuery.isUseDy" style="width: 65%"
+                           :disabled="editQuery.useMuti==true "
+                           placeholder="状态" clearable>
                   <el-option label="是" :value="true"></el-option>
                   <el-option label="否" :value="false"></el-option>
                 </el-select>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">多次/重复使用耗材</span>
+                <span class="sptext">启用使用单元</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
@@ -859,6 +859,11 @@ export default {
         });
       })
     },
+    setZdcfsycs(){
+      if(this.editQuery.useMuti==false){
+        this.editQuery.zdcfsycs=0;
+      }
+    },
     /** 转换菜单数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
diff --git a/src/views/inout/muti/ioOrderMutiAudit.vue b/src/views/inout/muti/ioOrderMutiAudit.vue
index f6ce44a6..e5415996 100644
--- a/src/views/inout/muti/ioOrderMutiAudit.vue
+++ b/src/views/inout/muti/ioOrderMutiAudit.vue
@@ -77,8 +77,6 @@
         <el-table-column label="失效日期" prop="expireDate"></el-table-column>
         <el-table-column label="创建人" prop="createUserName"></el-table-column>
         <el-table-column label="创建时间" prop="createTime"></el-table-column>
-        <el-table-column label="审核人" prop="auditUserName"></el-table-column>
-        <el-table-column label="审核时间" prop="auditTime"></el-table-column>
         <el-table-column label="操作" width="120px">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="auditDialog(scope.row)">审核</el-button>