Browse Source

配件商城

caojunjie 2 years ago
parent
commit
650976b4f4

+ 3 - 6
src/views/client/detailsInfo.vue

@@ -93,14 +93,11 @@
                         <template slot="corpIdSearch">
                             <crop-select v-model="search.corpId" corpType="KH"></crop-select>
                         </template>
-                        <template slot-scope="{ row, index }" slot="orderNo">
-                            <span style="color: #409EFF;cursor: pointer" @click.stop="editOrder(row)">{{ row.orderNo
-                            }}
-                            </span>
+                        <template slot-scope="{ row, index }" slot="sysNo">
+                            <span style="color: #409EFF;cursor: pointer" @click.stop="editOrder(row)">{{ row.sysNo}}</span>
                         </template>
                         <template slot-scope="{ row, index }" slot="corpId">
-                            <span style="color: #409EFF;cursor: pointer" @click.stop="editCustomer">{{ row.corpsName
-                            }}
+                            <span style="color: #409EFF;cursor: pointer" @click.stop="editCustomer">{{ row.corpsName}}
                             </span>
                         </template>
                         <template slot="businesDateSearch">

+ 1 - 1
src/views/client/js/optionList.js

@@ -366,7 +366,7 @@ export const sellOption = {
   column: [
     {
       label: "单号",
-      prop: "orderNo",
+      prop: "sysNo",
       overHidden: true,
       search: true,
       index: 1

+ 10 - 0
src/views/paymentManagement/paymentRecord/index.vue

@@ -120,6 +120,16 @@ export default {
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
+          }, {
+            label: "支付备注",
+            prop: "cause",
+            overHidden: true,
+            width: 200,
+          }, {
+            label: "平台备注",
+            prop: "remark",
+            overHidden: true,
+            width: 200,
           }
         ]
       }

+ 17 - 5
src/views/salesOrder/detailsPage.vue

@@ -193,6 +193,18 @@ export default {
             span: 8,
           },
           {
+            label: "销售单号",
+            prop: "sysNo",
+            disabled: true,
+            span: 8,
+          },
+          {
+            label: "退款单号",
+            prop: "srcOrderNo",
+            disabled: true,
+            span: 8,
+          },
+          {
             label: "送货地址",
             prop: "arrivalAddress",
             type: 'select',
@@ -203,14 +215,14 @@ export default {
             },
             allowCreate: true,
             filterable: true,
-            span: 16,
+            span: 24,
           },
           {
             label: "销售日期",
             prop: "businesDate",
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
+            type: "datetime",
+            format: "yyyy-MM-dd hh:mm:ss",
+            valueFormat: "yyyy-MM-dd hh:mm:ss",
             span: 8,
           },
           {
@@ -218,7 +230,7 @@ export default {
             prop: "advanceCollectionDate",
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
+            valueFormat: "yyyy-MM-dd hh:mm:ss",
             span: 8,
           },
           {

+ 1 - 1
src/views/salesOrder/js/optionList.js

@@ -122,7 +122,7 @@ export const option = {
       index: 9
     },
     {
-      label: "送货状态",
+      label: "状态",
       prop: "status",
       type: 'select',
       dataType:"string",

+ 2 - 2
vue.config.js

@@ -32,9 +32,9 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        // target: 'http://192.168.0.103:1080',
+        target: 'http://192.168.0.103:1080',
         // 打包地址
-        target: 'http://121.37.83.47:10004',//服务器ip
+        // target: 'http://121.37.83.47:10004',//服务器ip
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {