Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/views/businessManagement/proxyOrder/configuration/mainList.json

@@ -63,10 +63,17 @@
       "overHidden": true
     },
     {
+      "label": "采购合同号",
+      "prop": "srcOrderNo",
+      "index": 2,
+      "width": 100,
+      "overHidden": true
+    },
+    {
       "label": "客户名称",
       "prop": "corpId",
       "search": true,
-      "index": 2,
+      "index": 3,
       "width": 100,
       "overHidden": true
     },
@@ -77,7 +84,7 @@
       "searchRange": true,
       "prop": "businesDate",
       "search": true,
-      "index": 3,
+      "index": 4,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -91,7 +98,7 @@
       "searchRange": true,
       "prop": "advanceCollectionDate",
       "search": false,
-      "index": 4,
+      "index": 5,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -102,7 +109,7 @@
       "label": "订单来源",
       "prop": "a",
       "search": true,
-      "index": 5,
+      "index": 6,
       "width": 100,
       "overHidden": true
     },
@@ -110,7 +117,7 @@
       "label": "毛利额",
       "prop": "grossProfit",
       "search": false,
-      "index": 6,
+      "index": 7,
       "width": 100,
       "overHidden": true
     },
@@ -118,7 +125,7 @@
       "label": "毛利率(%)",
       "prop": "grossProfitRate",
       "search": false,
-      "index": 7,
+      "index": 8,
       "width": 100,
       "overHidden": true
     },
@@ -126,7 +133,7 @@
       "label": "销售金额",
       "prop": "orderAmount",
       "search": false,
-      "index": 8,
+      "index": 9,
       "width": 100,
       "overHidden": true
     },
@@ -134,7 +141,7 @@
       "label": "应收金额",
       "prop": "debitAmount",
       "search": false,
-      "index": 9,
+      "index": 10,
       "width": 100,
       "overHidden": true
     },
@@ -142,7 +149,7 @@
       "label": "未收金额",
       "prop": "balanceAmount",
       "search": false,
-      "index": 10,
+      "index": 11,
       "width": 100,
       "overHidden": true
     },
@@ -150,7 +157,7 @@
       "label": "订单数量",
       "prop": "orderQuantity",
       "search": false,
-      "index": 11,
+      "index": 12,
       "width": 100,
       "overHidden": true
     },
@@ -158,7 +165,7 @@
       "label": "已发数量",
       "prop": "actualQuantity",
       "search": false,
-      "index": 12,
+      "index": 13,
       "width": 100,
       "overHidden": true
     },
@@ -166,7 +173,7 @@
       "label": "所属公司",
       "prop": "belongToCorpName",
       "search": false,
-      "index": 13,
+      "index": 14,
       "width": 100,
       "overHidden": true
     },
@@ -174,7 +181,7 @@
       "label": "生产工厂",
       "prop": "productionPlantName",
       "search": false,
-      "index": 13,
+      "index": 15,
       "width": 100,
       "overHidden": true
     },
@@ -182,7 +189,7 @@
       "label": "发货地址",
       "prop": "shippingAddress",
       "search": true,
-      "index": 14,
+      "index": 16,
       "width": 100,
       "overHidden": true
     },
@@ -190,7 +197,7 @@
       "label": "到货地址",
       "prop": "arrivalAddress",
       "search": true,
-      "index": 15,
+      "index": 17,
       "width": 100,
       "overHidden": true
     },
@@ -204,7 +211,7 @@
       "label": "付款方式",
       "prop": "paymentType",
       "search": false,
-      "index": 16,
+      "index": 18,
       "width": 100,
       "overHidden": true
     },
@@ -215,7 +222,7 @@
       "searchRange": true,
       "prop": "actualDeliveryDate",
       "search": true,
-      "index": 17,
+      "index": 19,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -229,7 +236,7 @@
       "searchRange": true,
       "prop": "requiredDeliveryDate",
       "search": true,
-      "index": 18,
+      "index": 20,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -243,7 +250,7 @@
       "searchRange": true,
       "prop": "requiredArrivalDate",
       "search": true,
-      "index": 19,
+      "index": 21,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -260,7 +267,7 @@
       "label": "单据状态",
       "prop": "orderStatus",
       "search": true,
-      "index": 20,
+      "index": 22,
       "width": 100,
       "overHidden": true
     },
@@ -268,7 +275,7 @@
       "label": "公司户头",
       "prop": "banksAccountName",
       "search": false,
-      "index": 21,
+      "index": 23,
       "width": 100,
       "overHidden": true
     },
@@ -276,7 +283,7 @@
       "label": "系统编号",
       "prop": "sysNo",
       "search": true,
-      "index": 22,
+      "index": 24,
       "width": 100,
       "overHidden": true
     },
@@ -284,7 +291,7 @@
       "label": "主订单号",
       "prop": "morderNo",
       "search": false,
-      "index": 23,
+      "index": 25,
       "width": 100,
       "overHidden": true
     },
@@ -298,7 +305,7 @@
       "label": "制单人",
       "prop": "createUser",
       "search": true,
-      "index": 24,
+      "index": 26,
       "width": 100,
       "overHidden": true
     },
@@ -309,7 +316,7 @@
       "unlinkPanels": true,
       "searchRange": true,
       "search": true,
-      "index": 25,
+      "index": 27,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -320,7 +327,7 @@
       "label": "更改人",
       "prop": "updateUserName",
       "search": false,
-      "index": 26,
+      "index": 28,
       "width": 100,
       "overHidden": true
     },
@@ -328,7 +335,7 @@
       "label": "更改时间",
       "prop": "updateTime",
       "search": false,
-      "index": 27,
+      "index": 29,
       "width": 100,
       "overHidden": true
     },
@@ -336,7 +343,7 @@
       "label": "是否生成采购",
       "prop": "createPurchase",
       "search": false,
-      "index": 28,
+      "index": 30,
       "width": 100,
       "overHidden": true
     },
@@ -344,7 +351,7 @@
       "label": "生成采购时间",
       "prop": "createPurchaseTime",
       "search": false,
-      "index": 29,
+      "index": 31,
       "width": 100,
       "overHidden": true
     },
@@ -352,7 +359,7 @@
       "label": "采购人",
       "prop": "createPurchaseUser",
       "search": false,
-      "index": 30,
+      "index": 32,
       "width": 100,
       "overHidden": true
     },
@@ -360,7 +367,7 @@
       "label": "是否生成收货",
       "prop": "createFreight",
       "search": false,
-      "index": 31,
+      "index": 33,
       "width": 100,
       "overHidden": true
     },
@@ -368,7 +375,7 @@
       "label": "生成收货时间",
       "prop": "createFreightTime",
       "search": false,
-      "index": 32,
+      "index": 34,
       "width": 100,
       "overHidden": true
     },
@@ -376,7 +383,7 @@
       "label": "收货人",
       "prop": "createFreightUser",
       "search": false,
-      "index": 33,
+      "index": 35,
       "width": 100,
       "overHidden": true
     },
@@ -384,7 +391,7 @@
       "label": "请核状态",
       "prop": "status",
       "search": false,
-      "index": 34,
+      "index": 36,
       "width": 100,
       "overHidden": true
     },
@@ -392,7 +399,7 @@
       "label": "是否特批",
       "prop": "specialCheck",
       "search": false,
-      "index": 35,
+      "index": 37,
       "width": 100,
       "overHidden": true
     },
@@ -400,7 +407,7 @@
       "label": "特批状态",
       "prop": "specialCheckStatus",
       "search": false,
-      "index": 36,
+      "index": 38,
       "width": 100,
       "overHidden": true
     },
@@ -408,7 +415,7 @@
       "label": "特批提交人",
       "prop": "specialCheckUser",
       "search": false,
-      "index": 37,
+      "index": 39,
       "width": 100,
       "overHidden": true
     },
@@ -416,7 +423,7 @@
       "label": "特批提交时间",
       "prop": "specialCheckTime",
       "search": false,
-      "index": 38,
+      "index": 49,
       "width": 120,
       "overHidden": true
     },
@@ -424,7 +431,7 @@
       "label": "备注",
       "prop": "orderRemark",
       "search": false,
-      "index": 39,
+      "index": 41,
       "width": 120,
       "overHidden": true
     }

src/views/dealer/purchaseContract/config/mainList.json

@@ -20,8 +20,7 @@
   "summaryText": "合计",
   "expand": true,
   "expandWidth": 38,
-  "sumColumnList": [
-    {
+  "sumColumnList": [{
       "name": "orderQuantity",
       "type": "sum",
       "decimals": 0
@@ -35,13 +34,12 @@
       "type": "sum"
     }
   ],
-  "column": [
-    {
+  "column": [{
       "label": "采购订单号",
       "prop": "orderNo",
       "search": true,
       "index": 1,
-      "minWidth": 80,
+      "minWidth": 120,
       "overHidden": true
     },
     {
@@ -149,6 +147,13 @@
       "index": 14,
       "width": 100,
       "overHidden": true
+    },
+    {
+      "label": "合同状态",
+      "prop": "orderStatus",
+      "index": 15,
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

src/views/dealer/purchaseContract/detail.vue

@@ -77,7 +77,11 @@
           size="small"
           class="el-button--small-yh"
           @click.stop="submitPlatform"
-          :disabled="disabled"
+          :disabled="
+            disabled ||
+              form.orderStatus == '提交平台审核' ||
+              form.orderStatus == '平台审核通过'
+          "
           >提交平台</el-button
         >
         <el-button
@@ -94,7 +98,11 @@
           @click="editCustomer"
           size="small"
           :loading="btnLoading"
-          :disabled="disabled"
+          :disabled="
+            disabled ||
+              form.orderStatus == '提交平台审核' ||
+              form.orderStatus == '平台审核通过'
+          "
           >保存数据
         </el-button>
       </div>
@@ -117,10 +125,7 @@
             ></crop-select>
           </template>
           <template slot="orderStatus">
-            <el-input
-              v-model="form.orderStatus"
-              disabled
-            ></el-input>
+            <el-input v-model="form.orderStatus" disabled></el-input>
           </template>
           <template slot="storageId">
             <warehouse-select