doctor-admin-components 1.0.14-beta.5 → 1.0.14-beta.7

package/package.json

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

package/packages/index.js

@@ -21,7 +21,6 @@ import plugins from "./src/plugins";
 // import VueI18n from 'vue-i18n'
 // Vue.use(plugins)
 // Vue.use(VueI18n)
-
 import {
   parseTime,
   resetForm,

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

@@ -1,7 +1,7 @@
 <template>
   <div class="file-info" v-if="fileInfo.url">
     <div class="main">
-      <el-checkbox v-if="!this.hiddenOperation" label="" class="checkbox-position" @change="handleCheck" v-model="checkFlag">
+      <el-checkbox v-if="!this.hiddenOperation && !hiddenSelect" label="" class="checkbox-position" @change="handleCheck" v-model="checkFlag">
       </el-checkbox>
       <div class="area">
         <div class="area-info">
@@ -109,6 +109,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    hiddenSelect: {
+      type: Boolean,
+      default: false,
+    },
     type: {
       type: String,
       default: '',

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

@@ -3,6 +3,7 @@
     <!-- 添加或修改装运对话框 -->
     <el-dialog :visible.sync="open" z-index="1000" width="80%" :before-close="handleClose" :title="title">
       <slot name="">
+        <span v-if="isDraft" style="color: red">提示: 当前打开了【{{ form.lastUpdateUserName }}】在【{{ form.updateTime }}】保存的装运草稿</span>
         <span v-if="voidInvoiceList" style="color: red">【快捷转卖】：系统检测到此销售合同关联的采购合同存在【已作废】的装运，</span>
         <el-button v-if="voidInvoiceList" @click="handleReference" size="mini" type="text">点击这里直接复制并引用</el-button>
       </slot>
@@ -244,7 +245,13 @@
                         :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" @input="limitDecimalPlaces(index, scope1.$index, scope2.$index, scope2.row,'packageNetWeight')"></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>
@@ -384,7 +391,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="warning" @click="onSaveDraft" style="margin-right: 10px" v-if="title === '生成装运'">保存草稿</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>
@@ -547,7 +554,8 @@ export default {
       //编辑开关
       editSwitch: false,
       //
-      currentRow: null
+      currentRow: null,
+      isDraft: false
     }
   },
   props: {
@@ -674,15 +682,15 @@ export default {
     },
 
     limitDecimalPlaces(index, scope1Index, scope2Index, data, type) {
-      let value = data[type];
-      const decimalPlaces = 3;
+      let value = data[type]
+      const decimalPlaces = 3
       if (!isNaN(value)) {
-        value = parseFloat(value).toFixed(decimalPlaces);
-        value = parseFloat(value).toString();
-        data[type] = value;
+        value = parseFloat(value).toFixed(decimalPlaces)
+        value = parseFloat(value).toString()
+        data[type] = value
       }
       if (type == 'packageGrossWeight') {
-        this.changePackageGrossWeight(index, scope1Index, scope2Index);
+        this.changePackageGrossWeight(index, scope1Index, scope2Index)
       } else if (type == 'packageTareWeight') {
         this.changePackageTareWeight(index, scope1Index, scope2Index)
       } else if (type == 'packageNetWeight') {
@@ -1299,11 +1307,14 @@ export default {
       }
     },
     async onGetDraft() {
-      if(this.form.contractIds) {
+      if (this.form.contractIds) {
         const contractId = this.form.contractIds[0]
         const res = await getDraft(contractId)
         if (res.data) {
+          this.isDraft = true
           this.form = res.data
+        } else {
+          this.isDraft = false
         }
       }
     }