Merge remote-tracking branch 'origin/dev' into dev

src/views/basic/product/productEdit.vue

@@ -345,7 +345,7 @@
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
                 <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="!editQuery.useMuti"
-                          type="number" v-model="editQuery.zdcfsycs"></el-input>
+                          type="number" v-model="editQuery.useNum"></el-input>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
@@ -872,7 +872,7 @@ export default {
     },
     setZdcfsycs(){
       if(this.editQuery.useMuti==false){
-        this.editQuery.zdcfsycs=0;
+        this.editQuery.useNum=0;
       }
     },
     /** 转换菜单数据结构 */

src/views/inout/muti/ioOrderMutiEditDialog.vue

@@ -223,6 +223,11 @@ export default {
               this.inputQuery.ggxh = response.data.data.ggxh
               this.inputQuery.totalCount = response.data.data.totalCount
               this.inputQuery.useCount = response.data.data.useCount
+              if(this.inputQuery.mark!=null){
+                this.formName=2
+                this.inputQuery.mark = response.data.data.mark
+              }
+              this.detailList=response.data.detailList;
               this.$refs.fromCorpInputRef.focus();
             } else {
               this.$message.error(response.message);

src/views/purchase/purApply/purApplyEditDiaolog.vue

@@ -114,7 +114,6 @@
               <el-input size="small" v-model="scope.row.count"
                         placeholder="请输入数量" style="width: 80%"
                         type='number'
-                        @change="tableCountChange(scope.row)"
                         :disabled="scope.row.index !== selectedIndex"
                         oninput="value=value.replace(/[^\d]/g,'')"></el-input>
             </template>
@@ -127,6 +126,9 @@
               <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
                          @click.native="rowChange(scope.row)">编辑
               </el-button>
+              <el-button type="text" size="small" :disabled="scope.row.index !== selectedIndex" @click.stop="true"
+                         @click.native="tableCountChange(scope.row)">保存
+              </el-button>
               <el-button type="text" size="small" @click.stop="true"
                          @click.native="deleteCodeArray(scope.$index, scope.row)">删除
               </el-button>
@@ -397,6 +399,7 @@ export default {
     tableCountChange(row) {
       if (this.$isNotBlank(row)) {
         updateDetail(this.currentRow);
+        this.selectedIndex=""
       }
     },
     tableRowClassName({row, rowIndex}) {