doctor-admin-components 1.0.12-beta.21 → 1.0.12-beta.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "doctor-admin-components",
   "version1": "1.0.11",
-  "version": "1.0.12-beta.21",
+  "version": "1.0.12-beta.23",
   "private": false,
   "main1": "lib/index.umd.min.js",
   "main": "packages/index.js",

package/packages/src/api/biz/bizDealRecord.js

@@ -9,6 +9,19 @@ export function listBizDealRecord(query) {
   });
 }
 
+/**
+ * @description: 订单追踪
+ * @param {*} query
+ * @return {*}
+ */
+export function orderTracing(query) {
+  return request({
+    url: "/app-v3/order/tracing",
+    method: "get",
+    params: query
+  });
+}
+
 // 查询成交记录列表
 export function listDealWithContract(query) {
   return request({

package/packages/src/utils/request.js

@@ -6,6 +6,7 @@ import errorCode from "./errorCode";
 import { tansParams, blobValidate } from "./ruoyi";
 import cache from "../plugins/cache";
 import { saveAs } from "file-saver";
+import Cookies from "js-cookie";
 
 let downloadLoadingInstance;
 // 是否显示重新登录
@@ -78,6 +79,13 @@ service.interceptors.request.use(
         }
       }
     }
+    console.log(config.url);
+
+    if (config.url.includes('/order/tracing?askId')) {
+      config.baseURL = ''
+      const token = Cookies.get('token')
+      config.headers.token = token
+    }
     return config;
   },
   (error) => {

package/packages/src/views/biz/bizFileInfo/contract.vue

@@ -261,7 +261,7 @@
           v-if="
             channel !== 'official-website' && contract.contractType == 'sale'
           "
-          >生成船运</el-button
+          >生成装运</el-button
         >
         <el-tabs v-model="activeName">
           <el-tab-pane

package/packages/src/views/biz/bizShipment/add.vue

@@ -355,7 +355,10 @@
                       {{ "包裹" + (scope.$index + 1) }}
                     </template>
                   </el-table-column>
-                  <el-table-column label="毛重(t)" align="center">
+                  <el-table-column align="center">
+                    <template slot="header">
+                      <span style="color: red">*</span> 毛重(t)
+                    </template>
                     <template slot-scope="scope2">
                       <el-form-item
                         label=""
@@ -386,7 +389,10 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="皮重(t)" align="center">
+                  <el-table-column align="center">
+                    <template slot="header">
+                      <span style="color: red">*</span> 皮重(t)
+                    </template>
                     <template slot-scope="scope2">
                       <el-form-item
                         label=""
@@ -417,7 +423,10 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="净重(t)" align="center">
+                  <el-table-column align="center">
+                    <template slot="header">
+                      <span style="color: red">*</span> 净重(t)
+                    </template>
                     <template slot-scope="scope2">
                       <el-form-item
                         label=""
@@ -491,7 +500,10 @@
                 </el-table>
               </template>
             </el-table-column>
-            <el-table-column label="货物" align="center">
+            <el-table-column align="center">
+              <template slot="header">
+                <span style="color: red">*</span> 货物
+              </template>
               <template slot-scope="scope">
                 <el-form-item
                   label=""
@@ -522,7 +534,10 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="货物毛重(t)" align="center">
+            <el-table-column align="center">
+              <template slot="header">
+                <span style="color: red">*</span> 货物毛重(t)
+              </template>
               <template slot-scope="scope">
                 <el-form-item
                   label=""
@@ -551,7 +566,10 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="货物皮重(t)" align="center">
+            <el-table-column align="center">
+              <template slot="header">
+                <span style="color: red">*</span> 货物皮重(t)
+              </template>
               <template slot-scope="scope">
                 <el-form-item
                   label=""
@@ -580,7 +598,10 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="货物净重(t)" align="center">
+            <el-table-column align="center">
+              <template slot="header">
+                <span style="color: red">*</span> 货物净重(t)
+              </template>
               <template slot-scope="scope">
                 <el-form-item
                   label=""
@@ -609,7 +630,10 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="货物包裹件数" align="center">
+            <el-table-column align="center">
+              <template slot="header">
+                <span style="color: red">*</span> 货物包裹件数
+              </template>
               <template slot-scope="scope">
                 <el-form-item
                   label=""
@@ -657,12 +681,12 @@
           type="primary"
           @click="submitShipment"
           style="margin-right: 10px"
-          >{{ title == "添加装运" ? "仅生成装运" : "保存" }}</el-button
+          >{{ title == "生成装运" ? "仅生成装运" : "保存" }}</el-button
         >
         <el-dropdown
           @command="(command) => handleTemplate(command)"
           trigger="click"
-          v-if="title == '添加装运'"
+          v-if="title == '生成装运'"
           style="margin-right: 10px"
         >
           <el-button type="primary">
@@ -675,7 +699,7 @@
         </el-dropdown>
 
         <el-button
-          v-if="title == '添加装运'"
+          v-if="title == '生成装运'"
           type="primary"
           @click="submitForm"
           style="margin-right: 10px"
@@ -1172,7 +1196,7 @@ export default {
         this.addContainerRow();
       }
       this.open = true;
-      this.title = "添加装运";
+      this.title = "生成装运";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

package/packages/src/views/biz/contractTracing/contractSummary.vue

@@ -2,7 +2,7 @@
  * @Author: zhangpengwei 15038779532@163.com
  * @Date: 2023-08-28 19:04:39
  * @LastEditors: zhangpengwei 15038779532@163.com
- * @LastEditTime: 2023-09-14 18:03:30
+ * @LastEditTime: 2023-09-18 18:01:20
  * @FilePath: /doctor-admin-components/packages/src/views/biz/contractTracing/contractSummary.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -170,15 +170,16 @@
           </el-row>
           <el-row>
             <el-col :span="18">
-                          <el-form-item :label="$t('contractDetail.preferredQuoteMethod')">
-                            {{
-                              getPreferredQuoteMethodLabel(dealRecord.preferredQuoteMethod)
-                            }}
-                          </el-form-item>
+              <el-form-item :label="$t('contractDetail.preferredQuoteMethod')">
+                {{
+                  getPreferredQuoteMethodLabel(dealRecord.preferredQuoteMethod)
+                }}
+              </el-form-item>
+            </el-col>
+            <!-- 买家点价 -->
+            <el-col :span="6">
+              <div class="share" v-if="showPricing" style="right:100px;" @click.stop="openPriceFix">开始点价</div>
             </el-col>
-            <!-- <el-col :span="6">
-              <div class="share" v-if="channel === 'official-website'" style="right:100px;" @click.stop="openPriceFix">开始点价</div>
-            </el-col> -->
           </el-row>
         </el-card>
 
@@ -535,7 +536,10 @@
                 type="expand"
                 v-if="channel == 'official-website'"
               >
-                <template slot-scope="{ row }" v-if="row && row.claimList && row.claimList.length">
+                <template
+                  slot-scope="{ row }"
+                  v-if="row && row.claimList && row.claimList.length"
+                >
                   <div class="claim-list">
                     <div>
                       {{ $t("contract.Claim_records") }}({{
@@ -719,7 +723,10 @@
                   </el-button>
                   <!-- v-if="channel == 'official-website' && scope.row.showFallbackQuality" -->
                   <el-button
-                    v-if="channel == 'official-website' && scope.row.showFallbackQuality"
+                    v-if="
+                      channel == 'official-website' &&
+                      scope.row.showFallbackQuality
+                    "
                     size="mini"
                     type="primary"
                     style="padding-left: 5px; padding-right: 5px"
@@ -756,7 +763,7 @@
 
 <script>
 import { mapGetters } from "vuex";
-import { getBizDealRecordByAskId } from "../../../api/biz/bizDealRecord";
+import { getBizDealRecordByAskId, orderTracing } from "../../../api/biz/bizDealRecord";
 import {
   getBizContract,
   getBizContractByNo,
@@ -868,6 +875,7 @@ export default {
           updateTime: "2023-08-16T10:14:27",
         },
       ],
+      showPricing: false
     };
   },
   computed: {},
@@ -1000,7 +1008,7 @@ export default {
       this.$refs.shipmentDetail.handleShow(row);
     },
     //查看合同详情
-    
+
     viewContractDetail(contractNo) {
       getBizContractByNo(contractNo).then((res) => {
         this.$router.push({
@@ -1060,7 +1068,11 @@ export default {
         const blNumber = invoice.billOfLadingNo || "待补充";
         const containerNo = invoice.containerNoList || "待补充";
         const eta = this.parseTime(invoice.eta, "{y}-{m}-{d}") || "待补充";
-
+        const pod =
+          (invoice.terminal ? invoice.terminal : "") + invoice?.destination;
+        const askNames = invoice.containerDetailList
+          .map((item) => item.askName)
+          .join("/");
         const englishText = `更新时间 ${
           invoice.geekUpdateTime || invoice.shipmentCreateTime
         }
@@ -1072,6 +1084,8 @@ Value: $${value}
 BL#: ${blNumber}
 Container#: ${containerNo}
 ETA: ${eta}
+POD: ${pod}
+Descriptions: ${askNames}
 
 温馨提示:到货通知。请贵司收到此通知后的7个工作日内安排支付货款，以便安排提单电放，避免产生不必要的滞箱费用。
 致：收货公司${invoice.receiveCompanyName || "待补充"}
@@ -1080,7 +1094,10 @@ ${invoiceNoTitleZh}：${invoiceNo}
 发票金额：$${value}
 提单号：${blNumber}
 集装箱号：${containerNo}
-预计到港：${eta}`;
+预计到港：${eta}
+目的港: ${pod}
+品名: ${askNames}
+`;
 
         // 创建临时 <textarea> 元素，将链接写入其中
         const textArea = document.createElement("textarea");
@@ -1235,6 +1252,20 @@ ${invoiceNoTitleZh}：${invoiceNo}
                 item.askCover = item.imageList.toString();
               }
             });
+
+            if (this.dealRecord.askId && this.channel == 'official-website') {
+                orderTracing({askId:this.dealRecord.askId}).then(res => {
+                  if (res.code == 200) {
+                    res?.data?.contracts?.forEach(element => {
+                       if(element.showPricing) {
+                          this.showPricing = true
+                       }
+                    });
+                  }
+                }).catch(err => {
+                  console.log(err)
+                })
+            }
           });
           listBizInvoice({
             contractId: this.contractId,
@@ -1288,11 +1319,10 @@ ${invoiceNoTitleZh}：${invoiceNo}
           processedData.push(shipmentMap[key]);
         }
       }
-      console.log('===processedData==', processedData);
+      console.log("===processedData==", processedData);
       return processedData;
     },
 
-
     //获取合同信息
     getContract(contractId) {
       getBizContract(contractId).then((res) => {
@@ -1312,11 +1342,11 @@ ${invoiceNoTitleZh}：${invoiceNo}
     activeNameFun(v) {
       this.activeName = "" + v;
     },
-    openPriceFix () {
-      this.$buryingPoint({data:{funcKey:'click_fixprice_buyer'}})
-      this.$store.commit('setPriceFixAskId', this.contract.askId)
-      this.$store.commit('setFixPriceDialogVisible', true)
-    }
+    openPriceFix() {
+      this.$buryingPoint({ data: { funcKey: "click_fixprice_buyer" } });
+      this.$store.commit("setPriceFixAskId", this.contract.askId);
+      this.$store.commit("setFixPriceDialogVisible", true);
+    },
   },
 };
 </script>
@@ -1345,13 +1375,13 @@ ${invoiceNoTitleZh}：${invoiceNo}
   }
 }
 .share {
-    width: 120px;
-    height: 30px;
-    background: #4d904d;
-    color: #fff;
-    border-radius: 6px 6px 6px 6px;
-    line-height: 30px;
-    text-align: center;
-    cursor:pointer;
+  width: 120px;
+  height: 30px;
+  background: #4d904d;
+  color: #fff;
+  border-radius: 6px 6px 6px 6px;
+  line-height: 30px;
+  text-align: center;
+  cursor: pointer;
 }
 </style>