Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/enum/dict.js

@@ -68,7 +68,8 @@ export default {
   业务模块: 'business_module',
   事项类型: 'matter_type',
   贮藏:'layBy',
-  执行标准:'enforceStandards'
+  执行标准:'enforceStandards',
+  产地:'purchase_origin'
 };
 
 export const numberList = [
@@ -83,7 +84,8 @@ export const numberList = [
   'angle',
   'id_type',
   'rule_status',
-  'ledger'
+  'ledger',
+  'purchase_origin'
 ];
 //审核状态
 export const reviewStatus = {

src/views/material/product/components/PurchasingInfo.vue

@@ -55,7 +55,17 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="产地" prop="purchaseOrigins">
-            <el-select
+            <DictSelection
+              dictName="产地"
+              clearable
+              style="width: 100%"
+              :disabled="status == 'Detail'"
+              v-model="form.purchaseOrigins"
+              multiple
+            >
+            </DictSelection>
+
+            <!-- <el-select
               style="width: 100%"
               v-model="form.purchaseOrigins"
               filterable
@@ -67,7 +77,7 @@
                 :value="item.value"
                 :label="item.label"
               ></el-option>
-            </el-select>
+            </el-select> -->
           </el-form-item>
         </el-col>
         <el-col :span="8">

src/views/material/product/detail.vue

@@ -471,7 +471,9 @@ export default {
             weightUnit: '',
             packingUnit: '',
             extField: {},
-            measureType: 1
+            measureType: 1,
+             isEnabled:1,
+
           };
           this.categorySales = {};
           this.purchaseInfo = {};