Merge branch 'dev_ml_423' of http://121.40.253.172:3000/pengyue/jsh_erp into dev_huangjunjie

jshERP-web/src/views/material/modules/MaterialModal.vue

@@ -114,7 +114,7 @@
            
             </a-row>
             <a-row class="form-row" :gutter="24">
-              <a-col :md="6" :sm="24" v-if="!model.id">
+              <!-- <a-col :md="6" :sm="24" v-if="!model.id">
                 <a-form-item
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
@@ -145,7 +145,7 @@
                     </a-select>
                   </a-tooltip>
                 </a-form-item>
-              </a-col>
+              </a-col> -->
               <a-col :md="6" :sm="24">
                 <a-form-item
                   :labelCol="labelCol"
@@ -182,9 +182,6 @@
                   <a-input placeholder="" v-decorator.trim="['mnemonic']" :readOnly="true" />
                 </a-form-item>
               </a-col>
-    
-            </a-row>
-            <a-row class="form-row" :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item
                   :labelCol="labelCol"
@@ -205,6 +202,8 @@
                   </a-tree-select>
                 </a-form-item>
               </a-col>
+            </a-row>
+            <a-row class="form-row" :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item
                   :labelCol="labelCol"
@@ -1280,7 +1279,8 @@ export default {
       // 不勾选多单位
       if(!this.unitChecked){
         let formUnit = this.form.getFieldValue('unit')||''
-        target.setValues([{rowKey:row.id, values:{barCode: '', commodityUnit: formUnit}}])
+        console.log('formUnit', formUnit)
+        target.setValues([{rowKey:row.id, values:{barCode: '', commodityUnit: formUnit, ratio: formUnit}}])
       }
       console.log('onAdded', event)
     },

jshERP-web/src/views/stock/components/checkModal.vue

@@ -36,7 +36,7 @@
                 </a-col>
                 <a-col :lg="6" :md="12" :sm="24" class="form-col">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="商品名称">
-                    <a-input placeholder="请输入" v-model="queryParam.name" />
+                    <a-input placeholder="请输入" v-model="queryParam.materialName" />
                   </a-form-item>
                 </a-col>
                 <a-col :lg="6" :md="12" :sm="24" class="form-col">
@@ -51,7 +51,7 @@
                 </a-col>
                 <a-col :lg="6" :md="12" :sm="24" class="form-col">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否存在数量差异">
-                    <a-select placeholder="请选择" v-model="form.isDifference" :options="isDifferenceData"> </a-select>
+                    <a-select placeholder="请选择" v-model="queryParam.isDifference" :options="isDifferenceData"> </a-select>
                   </a-form-item>
                 </a-col>
                 <span>
@@ -218,11 +218,11 @@ export default {
       isDifferenceData: [
         {
           label: '是',
-          value: '1',
+          value: '2',
         },
         {
           label: '否',
-          value: '2',
+          value: '1',
         },
       ],
       categoryTree: [],
@@ -364,6 +364,7 @@ export default {
           id,
           operBy,
           operTime,
+          number
         } = res.data
         form.setFieldsValue({
           depotId,
@@ -378,6 +379,7 @@ export default {
           id,
           operBy,
           operTime,
+          number
         })
         this.getList(id)
       })