doctor-admin-components 1.0.14-beta.1 → 1.0.14-beta.2

package/package.json

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

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

@@ -136,3 +136,23 @@ export function haveVoidShipment(contractId) {
     params: {}
   })
 }
+
+// 保存草稿
+export function saveDraft(data) {
+  return request({
+    url: '/biz/shipment/saveDraft',
+    method: 'post',
+    data
+  })
+}
+
+// 保存草稿
+export function getDraft(contractId) {
+  return request({
+    url: '/biz/shipment/getDraft',
+    method: 'get',
+    params: {
+      contractId
+    }
+  })
+}

package/packages/src/utils/MycommonUtil.js

@@ -0,0 +1,12 @@
+export function CommonFormatNumber(input, bit) {
+  const num = Number(input);
+  if (isNaN(num)) {
+    return 'Invalid input';  // 输入不是有效数字时返回错误信息
+  }
+  if (!bit) {
+    bit = 3;
+  }
+  return parseFloat(num.toFixed(bit));
+}
+
+

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

@@ -1,9 +1,8 @@
 <template>
   <div class="app-container">
     <!-- 添加或修改装运对话框 -->
-    <el-dialog :visible.sync="open" z-index="1000" width="80%" :before-close="handleClose">
+    <el-dialog :visible.sync="open" z-index="1000" width="80%" :before-close="handleClose" :title="title">
       <slot name="">
-        <span>{{ title }}</span>
         <span v-if="voidInvoiceList" style="color: red">【快捷转卖】：系统检测到此销售合同关联的采购合同存在【已作废】的装运，</span>
         <el-button v-if="voidInvoiceList" @click="handleReference" size="mini" type="text">点击这里直接复制并引用</el-button>
       </slot>
@@ -17,13 +16,11 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="订舱号" prop="bookingNo">
               <el-input v-model="form.bookingNo" placeholder="请输入订舱号" size="small" />
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
             <el-form-item label="提单号" prop="billOfLadingNo">
               <el-input v-model="form.billOfLadingNo" placeholder="请输入提单号" size="small" />
@@ -214,7 +211,7 @@
                           placeholder="请输入毛重"
                           size="mini"
                           type="number"
-                          @input="changePackageGrossWeight(index, scope1.$index, scope2.$index)"
+                          @input="limitDecimalPlaces(index, scope1.$index, scope2.$index, scope2.row, 'packageGrossWeight')"
                         ></el-input>
                       </el-form-item>
                     </template>
@@ -233,7 +230,7 @@
                           placeholder="请输入皮重"
                           size="mini"
                           type="number"
-                          @input="changePackageTareWeight(index, scope1.$index, scope2.$index)"
+                          @input="limitDecimalPlaces(index, scope1.$index, scope2.$index, scope2.row, 'packageTareWeight')"
                         ></el-input>
                       </el-form-item>
                     </template>
@@ -247,7 +244,7 @@
                         :rules="rules.packageNetWeight"
                         :prop="'containerList.' + index + '.containerDetailList.' + scope1.$index + '.packageList.' + scope2.$index + '.packageNetWeight'"
                       >
-                        <el-input v-model="scope2.row.packageNetWeight" placeholder="请输入净重" size="mini" type="number"></el-input>
+                        <el-input v-model="scope2.row.packageNetWeight" placeholder="请输入净重" size="mini" type="number" @input="limitDecimalPlaces(index, scope1.$index, scope2.$index, scope2.row,'packageNetWeight')"></el-input>
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -387,6 +384,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
+        <el-button type="warning" @click="onSaveDraft" style="margin-right: 10px">保存草稿</el-button>
         <el-button type="primary" @click="submitShipment" style="margin-right: 10px">{{ title == '生成装运' ? '仅生成装运' : '保存草稿' }}</el-button>
         <el-dropdown @command="(command) => handleTemplate(command)" trigger="click" v-if="title == '生成装运'" style="margin-right: 10px">
           <el-button type="primary">{{ '装运并下载' }}</el-button>
@@ -448,7 +446,9 @@ import {
   addWithContainer,
   addContainerCheck,
   updateWithContainer,
-  updateWithContainerAndInvoice
+  updateWithContainerAndInvoice,
+  saveDraft,
+  getDraft
 } from '../../../api/biz/bizShipment'
 import { generateFinalInvoiceByShipmentId } from '../../../api/biz/bizInvoice'
 import { updateBizContractDetail } from '../../../api/biz/bizContractDetail'
@@ -672,6 +672,23 @@ export default {
         return total + Number(item.goodsNumber)
       }, 0)
     },
+
+    limitDecimalPlaces(index, scope1Index, scope2Index, data, type) {
+      let value = data[type];
+      const decimalPlaces = 3;
+      if (!isNaN(value)) {
+        value = parseFloat(value).toFixed(decimalPlaces);
+        value = parseFloat(value).toString();
+        data[type] = value;
+      }
+      if (type == 'packageGrossWeight') {
+        this.changePackageGrossWeight(index, scope1Index, scope2Index);
+      } else if (type == 'packageTareWeight') {
+        this.changePackageTareWeight(index, scope1Index, scope2Index)
+      } else if (type == 'packageNetWeight') {
+      }
+    },
+
     changePackageGrossWeight(index, k, yindex) {
       this.form.containerList[index].containerDetailList[k].goodsGrossWeight = this.form.containerList[index].containerDetailList[k].packageList.reduce((total, item) => {
         return total + Number(item.packageGrossWeight)
@@ -890,7 +907,6 @@ export default {
     /** 新增按钮操作 */
     handleAdd(contractDetailList, destinationPort, contract) {
       this.reset()
-      console.log(contract)
       if (contract.contractType == 'purchase') {
         this.$modal.msgError('请选择销售合同')
         return
@@ -946,6 +962,7 @@ export default {
       haveVoidShipment(contract.contractId).then((res) => {
         this.voidInvoiceList = res.rows && res.rows.length > 0 ? res.rows : null
       })
+      this.onGetDraft()
       // 测试数据
       // this.voidInvoiceList = [{'contractId': '1', 'contractNo':'合同号1'}]
     },
@@ -1269,6 +1286,26 @@ export default {
         },
         `bizShipment_${new Date().getTime()}.xlsx`
       )
+    },
+    async onSaveDraft() {
+      if (this.form.contractIds) {
+        this.form.contractId = this.form.contractIds[0]
+      }
+      const res = await saveDraft(this.form)
+      if (res.code === 200) {
+        this.$message.success('保存成功')
+      } else {
+        this.$message.error(res.message)
+      }
+    },
+    async onGetDraft() {
+      if(this.form.contractIds) {
+        const contractId = this.form.contractIds[0]
+        const res = await getDraft(contractId)
+        if (res.data) {
+          this.form = res.data
+        }
+      }
     }
   }
 }

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

@@ -42,7 +42,7 @@
           >
             <el-table-column label="Description" align="center" prop="askName"></el-table-column>
             <el-table-column label="Quantity" align="center" prop="weight">
-              <template slot-scope="scope">{{ scope.row.weight }}MT</template>
+              <template slot-scope="scope">{{ CommonFormatNumber(scope.row.weight) }}MT</template>
             </el-table-column>
             <el-table-column label="Unit Price/MT" align="center" width="200">
               <template slot-scope="{ row }">
@@ -193,6 +193,7 @@
 
 <script>
 import { exportPdf } from '../../../utils/pdf'
+import { CommonFormatNumber } from '../../../utils/MycommonUtil'
 
 export default {
   name: 'ContractPdf',
@@ -262,6 +263,7 @@ export default {
   },
   created() {},
   methods: {
+    CommonFormatNumber,
     //设置打印model为true
     setPrintModel(val) {
       this.printModel = val

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

@@ -168,7 +168,11 @@
             <el-table-column v-if="channel !== 'official-website'" :label="$t('contractDetail.subCategory')" prop="subCategoryName" width="110"></el-table-column>
             <el-table-column :label="$t('contractDetail.packaging')" prop="packingMethod" width="90" />
             <el-table-column prop="descriptions" :label="$t('contractDetail.description')" :width="channel === 'official-website' ? 200 : 160"></el-table-column>
-            <el-table-column prop="weight" :label="$t('contractDetail.weight')" width="120px"></el-table-column>
+            <el-table-column prop="weight" :label="$t('contractDetail.weight')" width="120px">
+              <template slot-scope="scope">
+                {{ CommonFormatNumber(scope.row.weight) }}
+              </template>
+            </el-table-column>
             <el-table-column v-if="channel !== 'official-website'" prop="sllerPrice" :label="$t('contractDetail.sellerPrice')" width="120">
               <template slot-scope="scope">
                 <span v-if="dealRecord.quoteType == 'FIXED'">{{ '$' + scope.row.sllerPrice }}</span>
@@ -372,6 +376,7 @@ import { listBizInvoice, getInfoWithShipment } from '../../../api/biz/bizInvoice
 import { listBizShipment, getGeekYumToken, updateAllShipmentStatus } from '../../../api/biz/bizShipment'
 import { listContainerWithInvoice } from '../../../api/biz/bizContainer'
 import ShipmentDetail from '../bizShipment/detail.vue'
+import { CommonFormatNumber } from '../../../utils/MycommonUtil'
 
 export default {
   name: 'ContractSummary',
@@ -490,6 +495,7 @@ export default {
     }
   },
   methods: {
+    CommonFormatNumber,
     /**
      * @description: 索赔类别
      * @param {*} type