doctor-admin-components 1.0.13-beta.7 → 1.0.13-beta.71

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

@@ -1,34 +1,54 @@
 <template>
   <div class="file-info" v-if="fileInfo.url">
     <div class="main">
-      <el-checkbox v-if="!this.hiddenOperation" label="" @change="handleCheck"> </el-checkbox>
+      <el-checkbox v-if="!this.hiddenOperation" label="" class="checkbox-position" @change="handleCheck" v-model="checkFlag">
+      </el-checkbox>
       <div class="area">
         <div class="area-info">
-          <div class="area-pdf" v-if="fileInfo.ext == '.pdf'"></div>
-          <el-image style="width: 54px; height: 54px" :src="fileInfo.url" fit="contain" :preview-src-list="[fileInfo.url]" v-else-if="isImage(fileInfo.ext)"></el-image>
+          <div class="area-pdf" v-if="isPdf(fileInfo.url)"></div>
+          <el-image style="width: 38px; height: 46px" :src="fileInfo.url" fit="contain" :preview-src-list="[fileInfo.url]" v-else-if="isImage(fileInfo.url)"></el-image>
           <div class="area-file" v-else></div>
-          <el-button type="text" size="mini" class="ml5" @click="openFile(fileInfo.url)">{{ $t('contractDetail.preview') }}</el-button>
-          <el-button type="text" size="mini" @click="handleDownload">
-            {{ $t('contractDetail.download') }}
-          </el-button>
-        </div>
-        <div v-if="!this.hiddenOperation">
-          <el-dropdown trigger="click" @command="handleCommand">
-            <span class="el-dropdown-link">
+          <div>
+          <div> {{ fileInfo.fileName }}</div>
+          <div class="preview-download-root">
+            <div
+              type="text"
+              size="mini"
+              class="preview-download"
+              @click="openFile(fileInfo.url)"
+              >{{ $t("contractDetail.preview") }}</div
+            >
+            <div  class="preview-download" type="text" size="mini" @click="handleDownload">
+              {{ $t("contractDetail.download") }}
+            </div>
+            <div v-if="!this.hiddenOperation">
+              <el-dropdown trigger="click" @command="handleCommand">
+                <span class="el-dropdown-link">
+                  <div class="more-icon"></div>
+                </span>
+                
+                <el-dropdown-menu slot="dropdown" v-if="type == 'signContract'" >
+                  <el-dropdown-item command="signContract">
+                   {{ $t('contractDetail.withdraw_sign') }} 
+                  </el-dropdown-item>
+                  <el-dropdown-item command="rename">{{$t('contractDetail.rename')}}</el-dropdown-item>
+                </el-dropdown-menu>
+                <el-dropdown-menu slot="dropdown" v-else >
+                  <el-dropdown-item command="delete">{{
+                    $t("contractDetail.delete")
+                  }}</el-dropdown-item>
+                  <el-dropdown-item command="rename">{{$t('contractDetail.rename')}}</el-dropdown-item>
+                  <!-- <el-dropdown-item command="deleteAndUpload">
+                    {{ $t("contractDetail.deleteAndUpload") }}
+                  </el-dropdown-item> -->
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+            <!-- <div v-else  style="width:120px;word-break:break-all">
               {{ fileInfo.fileName }}
-              <i class="el-icon-arrow-down el-icon--right"></i>
-            </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="delete">{{ $t('contractDetail.delete') }}</el-dropdown-item>
-              <el-dropdown-item command="rename">重命名</el-dropdown-item>
-              <el-dropdown-item command="deleteAndUpload">
-                {{ $t('contractDetail.deleteAndUpload') }}
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </div>
-        <div v-else style="width: 120px; word-break: break-all">
-          {{ fileInfo.fileName }}
+            </div> -->
+          </div>
+          </div>
         </div>
       </div>
     </div>
@@ -37,7 +57,7 @@
     <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
       <el-form ref="form" :model="form" label-width="100px">
         <el-form-item :label="$t('contractDetail.fileNmae')" prop="fileName">
-          <el-input v-model="form.fileName" placeholder="请输入文件名" />
+          <el-input v-model="form.fileName" :placeholder="$t('contractDetail.Please_enter_a_file_name')" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -60,7 +80,9 @@
 </template>
 <script>
 import { downloadFile } from '../../../utils/request'
-import { getBizFileInfo, delBizFileInfo, addBizFileInfo, updateBizFileInfo } from '../../../api/biz/bizFileInfo'
+import { getBizFileInfo, delBizFileInfo, addBizFileInfo, updateBizFileInfo, shipmentWithDrawDraftBill } from '../../../api/biz/bizFileInfo'
+import { isImage, isPdf } from '../../../utils/index';
+
 export default {
   name: 'FileShow',
   props: {
@@ -75,14 +97,26 @@ export default {
         }
       }
     },
+    selectFileListProp: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
     //是否隐藏操作
     hiddenOperation: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
+    type: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {
+      isImage,
+      isPdf,
       checkedIds: [],
       //是否显示上传弹出层
       uploadOpen: false,
@@ -93,9 +127,10 @@ export default {
       // 表单参数
       form: {},
       //上传表单
-      uploadForm: {}
+      uploadForm: {},
+      checkFlag: false
     }
-  },
+  },  
   computed: {
     fileId() {
       return this.fileInfo.fileId
@@ -172,8 +207,15 @@ export default {
           return delBizFileInfo(fileIds)
         })
         .then(() => {
-          this.$emit('refresh')
-          this.$modal.msgSuccess('删除成功')
+          if(row.fileType == "draft_bill_of_lading") {
+            shipmentWithDrawDraftBill({shipmentId:row.linkId}).then(() => {
+              this.$emit('refresh')
+              this.$modal.msgSuccess('删除成功')
+            })
+          } else {
+            this.$emit('refresh')
+            this.$modal.msgSuccess('删除成功')
+          }
         })
         .catch(() => {})
     },
@@ -207,22 +249,22 @@ export default {
     },
     handleCommand(command) {
       switch (command) {
-        case 'delete':
-          this.handleDelete(this.fileInfo)
-          break
-        case 'rename':
-          this.handleUpdate(this.fileInfo)
-          break
-        case 'deleteAndUpload':
-          this.handleDeleteAndUpload(this.fileInfo)
-          break
+        case "delete":
+          this.handleDelete(this.fileInfo);
+          break;
+        case "rename":
+          this.handleUpdate(this.fileInfo);
+          break;
+        case "signContract":
+          this.$emit("signContract", this.fileInfo);
+          break;
+        case "deleteAndUpload":
+          this.handleDeleteAndUpload(this.fileInfo);
+          break;
         default:
           break
       }
     },
-    isImage(ext) {
-      return ['.jpg', '.jpeg', '.png', '.gif'].includes(ext)
-    },
     /** 下载文件 */
     handleDownload() {
       // this.download(this.fileInfo.url, {}, this.fileInfo.fileName);
@@ -234,20 +276,36 @@ export default {
     handleCheck(val) {
       if (val) {
         this.$emit('checked', this.fileInfo)
+        this.checkFlag = true
       } else {
         this.$emit('uncheck', this.fileInfo.fileId)
+        this.checkFlag = false
       }
     }
+  },
+  watch: {
+    selectFileListProp: {
+      handler(val) {
+        if(val == 0) {
+          this.checkFlag = false
+        }
+      },
+      immediate: true,
+      deep: true 
+    }
   }
 }
 </script>
 <style lang="scss" scoped>
 .file-info {
-  width: 160px;
+  min-width: 450px;
   display: flex;
   // border: 1px solid red;
   .main {
     display: flex;
+    .checkbox-position {
+      margin-top: 10px;
+    }
     .area {
       margin-left: 5px;
       width: 100%;
@@ -258,7 +316,7 @@ export default {
         .area-pdf {
           width: 38px;
           height: 46px;
-          background: url('../../../assets/images/pdf.png') no-repeat center;
+          background: url("../../../assets/images/pdf-new.png") no-repeat center;
           background-size: contain;
         }
         .area-file {
@@ -267,6 +325,33 @@ export default {
           background: url('../../../assets/images/file.png') no-repeat center;
           background-size: contain;
         }
+        .more-icon {
+          margin-left:10px;
+          cursor: pointer;
+          width: 20px;
+          height: 20px;
+          background: url("../../../assets/images/more.png") no-repeat center;
+          background-size: contain;
+        }
+        .preview-download-root {
+          display:flex;
+          margin-top:5px;
+          
+          .preview-download {
+            cursor: pointer;
+            margin-left:8px;
+            min-width: 45px;
+            width:max-content;
+            padding: 0 10px;
+            height: 21px;
+            text-align: center;
+            line-height: 17px;
+            background: #FFFFFF;
+            border-radius: 11px;
+            font-size:12px;
+            border: 2px solid #D1D3D4;
+          } 
+        }
       }
     }
     .filename {

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

@@ -269,7 +269,7 @@ export default {
         .area-pdf {
           width: 38px;
           height: 46px;
-          background-image: url("../../../assets/images/pdf.png") no-repeat
+          background-image: url("../../../assets/images/pdf-new.png") no-repeat
             center;
           background-size: contain;
         }

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- 添加或修改装运对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body :before-close="handleClose">
+    <el-dialog :title="title" :visible.sync="open" width="80%" :before-close="handleClose">
       <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
         <el-row>
           <el-col :span="6">
@@ -93,6 +93,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="ETA更新" prop="etaUpdateOn" label-width="100">
+              <el-switch v-model="form.etaUpdateOn" active-text="自动" inactive-text="手动"> </el-switch>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-table stripe :data="contractDetailList" border>
           <el-table-column label="序号" type="index" align="center"></el-table-column>
@@ -147,14 +152,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="集装箱皮重(kg)" :prop="'containerList.' + index + '.containerTareWeight'" :rules="subrules.containerTareWeight" label-width="120px">
-                <el-input v-model="dt.containerTareWeight" placeholder="请输入" size="mini"></el-input>
+                <el-input v-model="dt.containerTareWeight" placeholder="请输入" size="mini" type="number"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
               <el-form-item label="总货物毛重(t)" :prop="'containerList.' + index + '.totalGoodsGrossWeight'" :rules="subrules.totalGoodsGrossWeight" label-width="105px">
-                <el-input v-if="editSwitch" size="mini" v-model="dt.totalGoodsGrossWeight"></el-input>
+                <el-input v-if="editSwitch" size="mini" v-model="dt.totalGoodsGrossWeight" type="number"></el-input>
                 <div v-else>
                   {{ dt.totalGoodsGrossWeight ? dt.totalGoodsGrossWeight : '自动计算' }}
                 </div>
@@ -162,7 +167,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="总货物皮重(t)" :prop="'containerList.' + index + '.totalGoodsTareWeight'" :rules="subrules.totalGoodsTareWeight" label-width="105px">
-                <el-input v-if="editSwitch" size="mini" v-model="dt.totalGoodsTareWeight"></el-input>
+                <el-input v-if="editSwitch" size="mini" v-model="dt.totalGoodsTareWeight" type="number"></el-input>
                 <div v-else>
                   {{ dt.totalGoodsTareWeight ? dt.totalGoodsTareWeight : '自动计算' }}
                 </div>
@@ -170,7 +175,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="总货物净重(t)" :prop="'containerList.' + index + '.totalGoodsNetWeight'" :rules="subrules.totalGoodsNetWeight" label-width="105px">
-                <el-input v-if="editSwitch" size="mini" v-model="dt.totalGoodsNetWeight"></el-input>
+                <el-input v-if="editSwitch" size="mini" v-model="dt.totalGoodsNetWeight" type="number"></el-input>
                 <div v-else>
                   {{ dt.totalGoodsNetWeight ? dt.totalGoodsNetWeight : '自动计算' }}
                 </div>
@@ -202,7 +207,8 @@
                           v-model="scope2.row.packageGrossWeight"
                           placeholder="请输入毛重"
                           size="mini"
-                          @change="changePackageGrossWeight(index, scope1.$index, scope2.$index)"
+                          type="number"
+                          @input="changePackageGrossWeight(index, scope1.$index, scope2.$index)"
                         ></el-input>
                       </el-form-item>
                     </template>
@@ -220,7 +226,8 @@
                           v-model="scope2.row.packageTareWeight"
                           placeholder="请输入皮重"
                           size="mini"
-                          @change="changePackageTareWeight(index, scope1.$index, scope2.$index)"
+                          type="number"
+                          @input="changePackageTareWeight(index, scope1.$index, scope2.$index)"
                         ></el-input>
                       </el-form-item>
                     </template>
@@ -234,7 +241,7 @@
                         :rules="rules.packageNetWeight"
                         :prop="'containerList.' + index + '.containerDetailList.' + scope1.$index + '.packageList.' + scope2.$index + '.packageNetWeight'"
                       >
-                        <el-input v-model="scope2.row.packageNetWeight" placeholder="请输入净重" size="mini"></el-input>
+                        <el-input v-model="scope2.row.packageNetWeight" placeholder="请输入净重" size="mini" type="number"></el-input>
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -348,7 +355,7 @@
                   :prop="'containerList.' + index + '.containerDetailList.' + scope.$index + '.goodsNumber'"
                   :rules="subrules.goodsNumber"
                 >
-                  <el-input v-model="scope.row.goodsNumber" size="small" @change="changeTotalGoodsNumber(index)"></el-input>
+                  <el-input v-model="scope.row.goodsNumber" size="small" @change="changeTotalGoodsNumber(index)" type="number"></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -388,7 +395,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
 
-      <div style="display: flex; justify-content: center; align-items: center">
+      <div style="display: flex; justify-content: center; align-items: center" v-if="title == '修改装运'">
         <ul>
           按钮说明
           <ul>
@@ -488,7 +495,9 @@ export default {
         actualArrivalDate: null
       },
       // 表单参数
-      form: {},
+      form: {
+        etaUpdateOn: true
+      },
       // 表单校验
       rules: {
         billOfLadingNo: [{ required: true, message: '提单号不能为空', trigger: 'blur' }],
@@ -627,6 +636,21 @@ export default {
       this.form.containerList[index].totalGoodsGrossWeight = this.form.containerList[index].containerDetailList.reduce((total, item) => {
         return total + Number(item.goodsGrossWeight)
       }, 0)
+      //计算净重
+      this.form.containerList[index].containerDetailList[k].packageList[yindex].packageNetWeight = (
+        this.form.containerList[index].containerDetailList[k].packageList[yindex].packageGrossWeight -
+        this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight
+      ).toFixed(3)
+
+      this.form.containerList[index].containerDetailList[k].goodsNetWeight = this.form.containerList[index].containerDetailList[k].packageList.reduce((total, item) => {
+        return total + Number(item.packageNetWeight)
+      }, 0)
+
+      this.form.containerList[index].totalGoodsNetWeight = this.form.containerList[index].containerDetailList
+        .reduce((total, item) => {
+          return total + Number(item.goodsNetWeight)
+        }, 0)
+        .toFixed(3)
     },
     changePackageTareWeight(index, k, yindex) {
       //计算皮重
@@ -766,6 +790,7 @@ export default {
         createTime: null,
         updateTime: null,
         containerList: [],
+        etaUpdateOn: true,
         loadingTime: this.utc2local(new Date(), 'yyyy-MM-DD HH:mm:ss')
       }
       this.contract = {
@@ -981,31 +1006,38 @@ export default {
     submitShipment() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          this.open = false
+          let loadingInstance = Loading.service({
+            text: '请稍候',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)',
+            customClass: 'custom-loading-class'
+          })
           if (this.form.shipmentId == null) {
-            let loadingInstance = Loading.service({
-              text: '请稍候',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            })
             addWithContainer(this.form).then((response) => {
-              loadingInstance.close()
-              this.$confirm('装运已生成！您可以点击“确认”按钮留在当前页面，或点击“去看看”按钮查看详细信息。', {
-                confirmButtonText: '确定',
-                cancelButtonText: '去看看',
-                type: 'warning'
-              })
-                .then(() => {})
-                .catch(() => {
-                  this.$router.push({
-                    name: 'BizShipment',
-                    params: { viewDetailFlag: true }
-                  })
+              if (response.code == 200) {
+                this.open = false
+                loadingInstance.close()
+                this.$confirm('装运已生成！您可以点击“确认”按钮留在当前页面，或点击“去看看”按钮查看详细信息。', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '去看看',
+                  type: 'warning'
                 })
-              this.$emit('refresh')
+                  .then(() => {})
+                  .catch(() => {
+                    this.$router.push({
+                      name: 'BizShipment',
+                      params: { viewDetailFlag: true }
+                    })
+                  })
+                this.$emit('refresh')
+              } else {
+                loadingInstance.close()
+              }
             })
           } else {
             updateWithContainer(this.form).then((res) => {
+              loadingInstance.close()
+              this.open = false
               this.$modal.msgSuccess('修改成功')
               this.$emit('refresh')
             })
@@ -1021,25 +1053,34 @@ export default {
     submitAndDownload(templateType) {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          this.open = false
           let loadingInstance = Loading.service({
             text: '请稍候',
             spinner: 'el-icon-loading',
-            background: 'rgba(0, 0, 0, 0.7)'
+            background: 'rgba(0, 0, 0, 0.7)',
+            customClass: 'custom-loading-class'
           })
-          addWithContainer(this.form).then((res) => {
-            loadingInstance.close()
-            var query = {}
-            query.orderByColumn = 'shipmentId'
-            query.isAsc = 'desc'
-            query.pageNum = 1
-            query.pageSize = 1
-            listBizShipment(query).then((res) => {
-              var shipment = res.rows[0]
-              this.handleDownloadShipment(shipment, templateType)
+          addWithContainer(this.form)
+            .then((res) => {
+              if (res.code == 200) {
+                var query = {}
+                query.orderByColumn = 'shipmentId'
+                query.isAsc = 'desc'
+                query.pageNum = 1
+                query.pageSize = 1
+                listBizShipment(query).then((res) => {
+                  var shipment = res.rows[0]
+                  this.handleDownloadShipment(shipment, templateType)
+                })
+                this.$emit('refresh')
+                this.open = false
+                loadingInstance.close()
+              } else {
+                loadingInstance.close()
+              }
+            })
+            .finally(() => {
+              loadingInstance.close()
             })
-            this.$emit('refresh')
-          })
         }
       })
     },
@@ -1065,26 +1106,42 @@ export default {
     submitForm() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          this.open = false
+          let loadingInstance = Loading.service({
+            text: '请稍候',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)',
+            customClass: 'custom-loading-class'
+          })
           if (this.form.shipmentId == null) {
-            addWithContainer(this.form).then((response) => {
-              this.$modal.msgSuccess('生成成功')
-              var query = {}
-              query.orderByColumn = 'shipmentId'
-              query.isAsc = 'desc'
-              query.pageNum = 1
-              query.pageSize = 10
-              if (this.contract.contractType == 'sale') {
-                query.saleContractId = this.contract.contractId
-              } else {
-                query.purchaseContractId = this.contract.contractId
-              }
-              listBizShipment(query).then((res) => {
-                var shipment = res.rows[0]
-                this.handleGenerateFinalInvoice(shipment)
+            addWithContainer(this.form)
+              .then((response) => {
+                if (response.code == 200) {
+                  this.open = false
+                  this.$modal.msgSuccess('生成成功')
+                  var query = {}
+                  query.orderByColumn = 'shipmentId'
+                  query.isAsc = 'desc'
+                  query.pageNum = 1
+                  query.pageSize = 10
+                  if (this.contract.contractType == 'sale') {
+                    query.saleContractId = this.contract.contractId
+                  } else {
+                    query.purchaseContractId = this.contract.contractId
+                  }
+                  listBizShipment(query).then((res) => {
+                    var shipment = res.rows[0]
+                    this.handleGenerateFinalInvoice(shipment)
+                  })
+                } else {
+                  loadingInstance.close()
+                }
+              })
+              .finally(() => {
+                loadingInstance.close()
               })
-            })
           } else {
+            loadingInstance.close()
+            this.open = false
             this.$emit('openGenerateLive', { ...this.form, quoteType: this.contract.quoteType })
           }
         }
@@ -1139,3 +1196,11 @@ export default {
   border-radius: 4px;
 }
 </style>
+<style lang="scss">
+.el-loading-mask.custom-loading-class.is-fullscreen {
+  z-index: 3000 !important;
+}
+.el-message.el-message--error {
+  z-index: 3001 !important;
+}
+</style>