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

src/views/material/changeApply/add/column.js

@@ -46,7 +46,6 @@ export default function useColumns() {
     //     is: "el-input",
     //     disabled:true,
     //   },
-
     // },
     {
       item: {
@@ -58,7 +57,6 @@ export default function useColumns() {
         valueFormat: "yyyy-MM-dd HH:mm:ss",
         disabled: true,
       },
-
     },
     {
       item: {
@@ -69,7 +67,6 @@ export default function useColumns() {
         is: "el-input",
         disabled: true,
       },
-
     },
     {
       item: {
@@ -81,7 +78,6 @@ export default function useColumns() {
         valueFormat: "yyyy-MM-dd HH:mm:ss",
         disabled: true,
       },
-
     },
     {
       item: {
@@ -92,7 +88,6 @@ export default function useColumns() {
         is: "el-input",
         disabled: true,
       },
-
     },
     {
       item: {
@@ -104,7 +99,6 @@ export default function useColumns() {
         valueFormat: "yyyy-MM-dd HH:mm:ss",
         disabled: true,
       },
-
     },
 
   ].map(({ item, attr }) => ({
@@ -169,11 +163,10 @@ export default function useColumns() {
               usefulLifeUnitId: 'usefulLifeUnitId',
               recentWarningPeriod: 'recentWarningPeriod',
               nearOnsetManagerment: 'nearOnsetManagerment',
+              originPlace: "originPlace", //产地
+              originPlaceName: "originPlaceName",
             },
-
-
           },
-
         },
         {
           item: {
@@ -185,7 +178,6 @@ export default function useColumns() {
             is: "el-input",
             // disabled:true,
           },
-
         },
         {
           item: {
@@ -196,7 +188,6 @@ export default function useColumns() {
             is: "el-select",
             dictName: "sys_number_yes_no", // 字典名
           },
-
         },
         {
           item: {
@@ -206,7 +197,6 @@ export default function useColumns() {
           attr: {
             is: "el-input",
           },
-
         },
         {
           item: {
@@ -218,8 +208,6 @@ export default function useColumns() {
             is: "el-input",
             maxlength: 150,
           },
-
-
         },
         {
           item: {
@@ -229,9 +217,7 @@ export default function useColumns() {
           attr: {
             is: "el-input",
           },
-
         },
-
         {
           item: {
             key: 'factoryName',
@@ -244,13 +230,38 @@ export default function useColumns() {
             referName: "MANUFACTURER_PARAM",
             dataMapping: {
               factory: 'id',
-              // brand: "brand", // 品牌
-              // originPlace: "country", // 产地
-              // originPlaceName: "countryName",
-              // productionPermit: "productionLicense", // 生产许可证
+              brand: "brand", // 品牌
+              originPlace: "country", // 产地
+              originPlaceName: "countryName",
+              productionPermit: "productionLicense", // 生产许可证
             }
           },
-
+        },
+        {
+          item: {
+            key: 'originPlaceName',
+            title: '产地',
+            require: true,
+          },
+          attr: {
+            is: "el-popover-select-v2",
+            valueKey: "name",
+            referName: "ORIGINPLACE_PARAM",
+            dataMapping: {
+              originPlace: 'id'
+            },
+            // disabled: true,
+          },
+        },
+        {
+          item: {
+            key: 'brand',
+            title: '品牌',
+          },
+          attr: {
+            is: "el-input",
+            // disabled: true,
+          },
         },
         {
           item: {
@@ -261,7 +272,6 @@ export default function useColumns() {
           attr: {
             is: "el-input",
           },
-
         },
         {
           item: {
@@ -273,7 +283,6 @@ export default function useColumns() {
             is: "el-select",
             dictName: "sys_storage_condition", // 字典名
           },
-
         },
         {
           item: {
@@ -284,7 +293,6 @@ export default function useColumns() {
             is: "el-select",
             dictName: "sys_conditions_carriage", // 字典名
           },
-
         },
         // {
         //   item:{
@@ -296,7 +304,6 @@ export default function useColumns() {
         //     controlsPosition:"right",
         //     min:0
         //   },
-
         // },
         {
           item: {
@@ -383,8 +390,6 @@ export default function useColumns() {
             controlsPosition: "right",
           },
         },
-
-
         // {
         //   item:{
         //     key:'diCode',
@@ -393,7 +398,6 @@ export default function useColumns() {
         //   attr:{
         //     is: "el-input",
         //   },
-
         // },
         // {
         //   item:{
@@ -403,7 +407,6 @@ export default function useColumns() {
         //   attr:{
         //     is: "el-input",
         //   },
-
         // },
         {
           item: {
@@ -414,7 +417,6 @@ export default function useColumns() {
             is: "el-input",
             disabled: true,
           },
-
         },
         {
           item: {
@@ -425,7 +427,6 @@ export default function useColumns() {
             is: "el-input",
             disabled: true,
           },
-
         },
         {
           item: {
@@ -436,7 +437,6 @@ export default function useColumns() {
             is: "el-input",
             disabled: true,
           },
-
         },
         {
           item: {
@@ -447,7 +447,6 @@ export default function useColumns() {
             is: "el-input",
             disabled: true,
           },
-
         },
         {
           item: {
@@ -458,7 +457,6 @@ export default function useColumns() {
             is: "el-select",
             dictName: "sys_medicine", // 字典名
           },
-
         },
         {
           item: {
@@ -468,7 +466,6 @@ export default function useColumns() {
           attr: {
             is: "el-input",
           },
-
         },
         {
           item: {
@@ -478,7 +475,6 @@ export default function useColumns() {
           attr: {
             is: "el-input",
           },
-
         },
         {
           item: {
@@ -490,7 +486,6 @@ export default function useColumns() {
             is: "el-select",
             dictName: "medical_instruments", // 字典名
           },
-
         },
         {
           item: {
@@ -501,7 +496,6 @@ export default function useColumns() {
             is: "el-select",
             dictName: "curing_type", // 字典名
           },
-
         },
         // {
         //   item:{
@@ -516,9 +510,7 @@ export default function useColumns() {
         //       dosageFrom:'id'
         //     }
         //   },
-
         // },
-
       ]
     },
   ]

src/views/purchase/PurchaseDemandList/add.vue

@@ -20,13 +20,13 @@
                 trigger: 'blur',
               }"
             >
-              <!-- @change="changeBillType(basicForm.billType)" -->
               <el-select
                 clearable
                 v-model="basicForm.billType"
                 :disabled="sonDisable"
                 :size="size"
                 style="width: 200px"
+                @change="changeBillType(basicForm.billType)"
               >
                 <el-option
                   v-for="dict in dict.type.sys_business"
@@ -1635,11 +1635,6 @@ export default {
     };
   },
   watch: {
-    "basicForm.billType": {
-      handler(nVal, oVal) {
-        this.changeBillType(nVal);
-      },
-    },
     // "basicForm.demandDate": {
     //   handler(nVal, oVal) {
     //     if (nVal && nVal !== "") {
@@ -1690,7 +1685,6 @@ export default {
     async dafaultDate() {
       try {
         let { planType, demandDate } = this.basicForm;
-        console.log();
         let { code, data } = await SetdemandDate({ planType });
         if (code == 200) {
           this.basicForm.demandDate = new Date(data).Format("yyyy-MM-dd");
@@ -1701,12 +1695,13 @@ export default {
     // 改变需求计划改变需求日期
     changeplanType(val) {
       this.dafaultDate();
-      console.log(val);
       if (val == "JJXQ") {
         this.basicForm.billType = "JJXQ";
+        this.changeBillType(this.basicForm.billType);
       } else {
         if (this.basicForm.billType == "JJXQ") {
           this.basicForm.billType = "";
+          this.changeBillType(this.basicForm.billType);
         }
       }
 
@@ -2170,7 +2165,7 @@ export default {
             .then((res) => {
               if (res.code === 200) {
                 reciveForm.puDemandItemList = res.data;
-                console.log("reciveForm", reciveForm);
+                // console.log("reciveForm", reciveForm);
                 this.basicForm = reciveForm;
                 if (this.basicForm.org) {
                   this.reBackRefer("ORG_PARAM", this.basicForm.org);
@@ -2233,7 +2228,7 @@ export default {
       this.ids = selection.map((item) => {
         return item.id;
       });
-      console.log("选中数组", this.ids);
+      // console.log("选中数组", this.ids);
     },
     rowSelect(row) {
       this.$refs.table.toggleRowSelection(row);
@@ -2448,7 +2443,7 @@ export default {
       this.$modal.loading("正在处理数据...");
       e.preventDefault(); //阻止默认粘贴事件
       let source = e.clipboardData.getData("Text");
-      console.log("scope", scope.column.property);
+      // console.log("scope", scope.column.property);
       // 首先对源头进行解析
       let rows = source.split("\r\n"); // 拆成一个数组
       // 数组去除空字符串
@@ -2503,7 +2498,7 @@ export default {
                   line.storageCondition = rowList[i].storageCondition;
                   line.materialRemark = rowList[i].remark;
                   newLine.push(line);
-                  console.log("临时数组", newLine);
+                  // console.log("临时数组", newLine);
                 }
                 // 删除指定下标
                 this.basicForm.puDemandItemList.splice(
@@ -2688,13 +2683,13 @@ export default {
     },
     // 明细行选择物料编码带出数据
     chooseMaterial(index) {
-      console.log("🚀 ~ file: add.vue:790 ~ chooseMaterial ~ index:", index);
+      // console.log("🚀 ~ file: add.vue:790 ~ chooseMaterial ~ index:", index);
       this.tableIndex = index;
       // 传0只展示同步NC了的物料
       this.$refs.materialRefer.init(0);
     },
     selectMaterial(selection) {
-      console.log("选中的物料", selection);
+      // console.log("选中的物料", selection);
       if (selection.length <= 1) {
         // 选择新物料时先清空行内其他信息
         this.basicForm.puDemandItemList[this.tableIndex].reservedProportion =
@@ -3011,7 +3006,7 @@ export default {
     },
     // 批量调整确认
     confirmAdjust() {
-      console.log("data", this.adjust);
+      // console.log("data", this.adjust);
       if (
         this.adjust.csFlag == "N" ||
         this.adjust.csFlag == "" ||