Browse Source

采购-采购订单下方表格高度调整;
采购-订单生成支持批量转派;

001295 1 year ago
parent
commit
8da269bda5

+ 3 - 3
src/views/purchase/purchase-order/index.vue

@@ -662,8 +662,7 @@ export default {
           :disabled="judgeIsLineReturn()"
         >行退回</el-button>
       </el-row>
-      <el-tabs v-model="tabName" @tab-click="handleTabClick" style="width: 100%;padding: 20px 10px">
-       
+      <el-tabs v-model="tabName" @tab-click="handleTabClick" style="width: 100%;padding: 20px 10px;height: 1000px;">
         <el-tab-pane 
           v-for="(column, index) in tabColumns" 
           :key="index" 
@@ -671,9 +670,10 @@ export default {
           :name="column.key"
         >
           <el-super-table
+            style="padding: 20px 10px;height: 800px;"
             v-model="tabTableDatas[column.key]"
             :ref="column.key"
-            max-height="200"
+            max-height="500"
             :dict="dict"
             :columns="column.tableColumns"
             :selectable="setTabSelectable"

+ 28 - 19
src/views/purchase/task/zhuan-pai/index.vue

@@ -16,13 +16,17 @@ export default {
       title: "转 派",
       visible: false,
       loading: false,
-      params: { id: "", buyer: "", buyerName: "" },
+      // params: { id: "", buyer: "", buyerName: "" },
+      params:[],
+      buyerModel:{buyer: "", buyerName: ""},
     };
   },
   computed: {
     disabled: {
       get() {
-        return this.selectData.length !== 1;
+        // return this.selectData.length !== 1;
+        // add by wjie
+        return this.selectData.length < 1;
       },
       set() {},
     },
@@ -31,29 +35,34 @@ export default {
   methods: {
     //
     open(prop) {
+      let arr = prop.filter((element) => element.status != '0');
+      if(arr.length > 0){
+        this.$modal.notifyWarning("您所选的单据中存在非自由态,无法进行操作,请确认数据!");
+        return;
+      }
+      this.params = prop;
       this.visible = true;
-      this.params.id = prop.id;
     },
     //
     hide() {
       this.visible = false;
-      this.params.id = "";
-      this.params.buyer = "";
-      this.params.buyerName = "";
+      // this.params.id = "";
+      // this.params.buyer = "";
+      // this.params.buyerName = "";
+      this.params = [];
+      this.buyerModel = {buyer: "", buyerName: ""};
     },
     //
     async submit(prop) {
       try {
         // try
         this.loading = true;
-        const { id, buyer, buyerName } = prop;
-        const { msg, code } = await MODEIFYBUYER([
-          {
-            buyer,
-            buyerName,
-            id: Number(id),
-          },
-        ]);
+        const { buyer, buyerName } = prop;
+        for(let i in this.selectData){
+          this.selectData[i].buyer = buyer;
+          this.selectData[i].buyerName = buyerName;
+        }
+        const { msg, code } = await MODEIFYBUYER(this.selectData);
         if (code === 200) {
           this.hide();
           this.$emit("success");
@@ -78,7 +87,7 @@ export default {
     v-bind="$attrs"
     v-on="$listeners"
     :disabled="disabled"
-    @click="open(selectData[0])"
+    @click="open(selectData)"
   >
     {{ title }}
     <el-dialog
@@ -99,7 +108,7 @@ export default {
           type="primary"
           :size="$attrs.size"
           :loading="loading"
-          @click="submit(params)"
+          @click="submit(buyerModel)"
           >确 认</el-button
         >
       </div>
@@ -113,15 +122,15 @@ export default {
       </el-alert>
       <el-form
         :size="$attrs.size"
-        :model="params"
+        :model="buyerModel"
         label-width="0px"
         label-position="right"
         style="padding: 0"
       >
         <el-form-item prop="" label="">
           <el-popover-select-v2
-            v-model="params.buyerName"
-            :source.sync="params"
+            v-model="buyerModel.buyerName"
+            :source.sync="buyerModel"
             :data-mapping="{ buyer: 'code', buyerName: 'name' }"
             valueKey="name"
             referName="CONTACTS_PARAM"