qymljy 2 years ago
parent
commit
a148c8952c

+ 1 - 1
src/HDrpManagement/logistics/modules/defaultInfo.vue

@@ -12,7 +12,7 @@
       <el-descriptions-item label="快递公司">{{ mainData.logiscomp_enterprisename?mainData.logiscomp_enterprisename:"--" }}</el-descriptions-item>
       <el-descriptions-item label="快递单号">{{ mainData.logisticno?mainData.logisticno:"--" }}</el-descriptions-item>
       <el-descriptions-item :style="style(mainData.status)" label="运费状态">
-        <span :style="colorStyle">{{ mainData.status?mainData.status:"--" }}</span>
+        {{ mainData.paytype }}
       </el-descriptions-item>
       <el-descriptions-item label="运费">{{ mainData.freightamount?mainData.freightamount:"--" }}</el-descriptions-item>
       <el-descriptions-item label="备注">{{ mainData.remarks?mainData.kd100remarksid:"--" }}</el-descriptions-item>

+ 2 - 2
src/SDrpManagement/agentOrder/details/tabs/dispatch.vue

@@ -56,9 +56,9 @@ export default {
       param:{
         "id": 20221205111302,
         "content": {
-          "sa_orderid": 12,
+          "sa_orderid": this.$route.query.id,
           "pageNumber": 1,
-          "pageSize": 17,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }

+ 2 - 2
src/SDrpManagement/agentOrder/details/tabs/logistics.vue

@@ -49,9 +49,9 @@ export default {
       param:{
         "id": 20221205111402,
         "content": {
-          "sa_orderid": 12,
+          "sa_orderid": this.$route.query.id,
           "pageNumber": 1,
-          "pageSize": 17,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }

+ 1 - 1
src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -1,7 +1,7 @@
 <template>
 <el-row :gutter="10">
   <el-col :span="setcol">
-    <el-button style="margin:0 0 10px 0px" size="small" type="primary" @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>
+    <el-button v-if="data.status === '新建'" style="margin:0 0 10px 0px" size="small" type="primary"  @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>
     <el-table
       ref="multipleTable"
       :data="tableData"