浏览代码

修改bug

lichao 3 年之前
父节点
当前提交
777b31c8f6

+ 16 - 0
src/views/businessManagement/purchaseOrder/configuration/mainList.json

@@ -212,6 +212,22 @@
       "index": 18,
       "width": 100,
       "overHidden": true
+    },
+    {
+      "label": "是否生成发货",
+      "prop": "createReceiving",
+      "search": false,
+      "index": 19,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "生成发货时间",
+      "prop": "createReceivingTime",
+      "search": false,
+      "index": 20,
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

+ 3 - 0
src/views/businessManagement/purchaseOrder/index.vue

@@ -46,6 +46,9 @@
         <template slot-scope="scope" slot="createUser">
           {{ scope.row.createUserName }}
         </template>
+        <template slot-scope="scope" slot="createReceiving">
+          {{ scope.row.createReceiving == 1? '是': '否' }}
+        </template>
         <template slot-scope="scope" slot="menu">
 <!--          <el-button-->
 <!--            type="text"-->

+ 32 - 0
src/views/businessManagement/salesOrder/configuration/mainList.json

@@ -331,6 +331,38 @@
       "index": 27,
       "width": 100,
       "overHidden": true
+    },
+    {
+      "label": "是否生成采购",
+      "prop": "createPurchase",
+      "search": false,
+      "index": 28,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "生成采购时间",
+      "prop": "createPurchaseTime",
+      "search": false,
+      "index": 29,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "是否生成收货",
+      "prop": "createReceiving",
+      "search": false,
+      "index": 30,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "生成收货时间",
+      "prop": "createReceivingTime",
+      "search": false,
+      "index": 31,
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

+ 1 - 1
src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -2961,7 +2961,7 @@ export default {
                 });
               })
             } else if (type == '采购') {
-              this.$confirm("是否生成采购单?", {
+              this.$confirm(this.form.createPurchase == 0? "是否生成采购单?": "已经生成个采购单,是否继续生成?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"

+ 7 - 1
src/views/businessManagement/salesOrder/index.vue

@@ -59,6 +59,12 @@
         <template slot-scope="scope" slot="createUser">
           {{ scope.row.createUserName }}
         </template>
+        <template slot-scope="scope" slot="createPurchase">
+          {{ scope.row.createPurchase == 1? '是': '否' }}
+        </template>
+        <template slot-scope="scope" slot="createReceiving">
+          {{ scope.row.createReceiving == 1? '是': '否' }}
+        </template>
         <template slot="menuLeft" slot-scope="{size}">
           <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制单据</el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报表打印</el-button>
@@ -552,7 +558,7 @@ export default {
     },
     // 生成采购
     saveSell(row) {
-      this.$confirm("是否生成采购单?", {
+      this.$confirm(row.createPurchase == 0? "是否生成采购单?": "已经生成个采购单,是否继续生成?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"