Merge remote-tracking branch 'origin/master'

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>

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) {

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>

src/views/purchase/purApply/purApplyEditDiaolog.vue

@@ -418,6 +418,7 @@ export default {
       }
     },
     deleteCodeArray(index, row) {
+      this.orderEditor=true;
       this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -426,16 +427,20 @@ export default {
         this.$refs.multipleTable.setCurrentRow();
         this.currentRow = {};
         this.selectedIndex = "";
-
+        //this.$message.success(this.orderEditor);
         if (this.orderEditor) {
           this.detailLoading = true;
+          //this.$message.success(6666);
           if (this.$isNotBlank(row.id)) {
+            //this.$message.success(66661);
             delApplyDetail(row.id)
               .then(response => {
+                //this.$message.success(66662);
                 this.detailLoading = false;
                 if (response.code === 20000) {
+                  //this.$message.success(66663);
                   this.$message.success(response.data);
-                  // this.getStockOrderDetailList();
+                  this.getStockOrderDetailList();
                   this.codeArray.splice(index, 1);
                 } else {
                   this.$message.error(response.message);