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

src/views/material/requisition/fun-button/pldc/index.vue

@@ -6,6 +6,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    queryParams: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
     return {
@@ -28,11 +32,14 @@ export default {
   methods: {
     async onClick() {
       try {
-        let ids = this.$props.selectData.map((item) => item.id);
-        console.log(ids, "ids");
+        let { queryParams, selectData } = this.$props;
+        let ids = selectData.map((item) => item.id);
+
+        let params = ids.length ? { ids } : { ...queryParams };
+        console.log(params, "params");
         this.download(
           "/system/apply/material/exportApplies",
-          { ids },
+          { ...params },
           `物料申请单${new Date().getTime()}.xlsx`
         );
       } catch (error) {}
@@ -42,7 +49,7 @@ export default {
 };
 </script>
 <template>
-  <el-button @click="onClick" :disabled="disabled" :size="$attrs.size">
+  <el-button @click="onClick" :size="$attrs.size">
     {{ title }}
   </el-button>
 </template>

src/views/material/requisition/index.vue

@@ -289,6 +289,7 @@ export default {
 
         <pldc-button
           :size="size"
+          :queryParams="params"
           :select-data="selectData"
           @success="useQuery(params, page)"
         ></pldc-button>

src/views/purchase/transferOrder/add/columns.js

@@ -319,7 +319,7 @@ export default function useColumns() {
           }
         },
         {
-          item: { key: "producBatch", title: "产品批号", require: true,},
+          item: { key: "producBatch", title: "产品批号", },
           attr: {
             is: "el-popover-select-v2",
             valueKey: "code",

vue.config.js

@@ -46,6 +46,7 @@ module.exports = {
         // target: `http://172.16.13.47:8000/drp-admin`, //这是一个美女的本地
         // target: `http://172.16.13.21:8000/drp-admin`, //CKF本地
         // target: `http://172.16.61.99:8000/drp-admin`, //lz's localhost
+        // target: `http://172.16.13.30:8000/drp-admin`, //dz's localhost
         //  target: `http://127.0.0.1:8000/drp-admin`,
         // target: 'http://172.16.62.148:8000/drp-admin', //tkf本地
         changeOrigin: true,