单据可以重复上传

.env.production

@@ -74,6 +74,7 @@ VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/'
 
 # 漳州疾控
 VUE_APP_BASE_API = 'http://116.204.116.198:9160/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

package.json

@@ -10,7 +10,7 @@
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
     "server": "SET NODE_OPTIONS=--openssl-legacy-provider && webpack-dev-server --env.server --env.develop --inline --max-old-space-size=3000",
-    "dev": "vue-cli-service serve --open"
+    "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --open"
   },
   "husky": {
     "hooks": {

src/views/basic/product/drug/drugAdd.vue

@@ -150,7 +150,6 @@
                   @click.stop="true"
                   @click.native="deleteLevel(scope.$index, scope.row)"
                 >删除
-
                 </el-button>
               </template>
             </el-table-column>
@@ -162,12 +161,9 @@
           <el-row :gutter="20">
             <el-col :span="11" class="el-col">
               <el-form-item label="计量单位:" prop="distributeLevel" label-width="160px">
-
                 <el-select v-model="newProductData.distributeLevel" size="small" style="width: 90%"
                            @change="distributeLevelDiChange"
-                           placeholder="请选择计量单位"
+                           placeholder="请选择计量单位">
-
-                >
                   <el-option
                     v-for="item in levelUnitList"
                     :key="item.packLevel"
@@ -265,7 +261,7 @@
           <el-row type="flex">
             <el-col :span="11" class="el-col">
               <el-form-item label="明细分类:" prop="detailSort">
-                <el-select v-model="newProductData.detailSort" style="width: 90%" placeholder="选择明细分类" >
+                <el-select v-model="newProductData.detailSort" style="width: 90%" placeholder="选择明细分类">
                   <el-option label="麻醉药品原料药" :value="1"></el-option>
                   <el-option label="第一类精神药品原料药" :value="2"></el-option>
                   <el-option label="第二类精神药品原料药" :value="3"></el-option>
@@ -534,7 +530,8 @@
       @close="closeSelectDrugLevelVisible"
     >
 
-      <el-form :rules="formRulesSelectedDrug" :model="filterQueryDrugLevel" class="query-form" label-width="100px" ref="formSelectedDrug">
+      <el-form :rules="formRulesSelectedDrug" :model="filterQueryDrugLevel" class="query-form" label-width="100px"
+               ref="formSelectedDrug">
         <el-row>
           <el-col :span="4">
             <el-form-item label="层级标识:">
@@ -613,7 +610,7 @@ import {
   updatetDrug,
   delDrugLevel,
   updateLevelDrug, calculateDistCount, calculateUseCount,
-  getDrugLevelList,getDrugLevelListBycode,updateLevelDrugAli
+  getDrugLevelList, getDrugLevelListBycode, updateLevelDrugAli
 } from '@/api/basic/product/drugUdiinfos'
 import {getCodeRelDetail} from '@/api/basic/product/udiRelevance'
 import {isBlank} from "@/utils/strUtil";
@@ -660,7 +657,7 @@ export default {
     }
   },
   // components: {selectChargesProjectDialog, chooseHouseDrug},
-  components: { chooseHouseDrug},
+  components: {chooseHouseDrug},
   data() {
     return {
       ybDrugDetail: {},
@@ -671,7 +668,7 @@ export default {
         page: 1,
         limit: 20,
         total: 0,
-        approvalNum:"",
+        approvalNum: "",
       },
       newProductData: {
         cpmctymc: null,
@@ -761,7 +758,7 @@ export default {
       },
       formRulesSelectedDrug: {
         cpmctymc: [
-          { required: true, message: '请输入药品通用名', trigger: 'blur' }
+          {required: true, message: '请输入药品通用名', trigger: 'blur'}
         ],
       },
       detailList: [
@@ -771,7 +768,7 @@ export default {
           nameCode: '',
           packLevel: null,
           bhxjsl: null,
-          packRatio:null,
+          packRatio: null,
           isDisabled: false,
           isUpDisabled: true,
           rowDisabled: false
@@ -966,7 +963,7 @@ export default {
       if (isNaN(row.packLevel)) {
         row.packLevel = 0
       }
-      if(this.newProductData.detailSort > 9 && row.packLevel == '0' ){
+      if (this.newProductData.detailSort > 9 && row.packLevel == '0') {
         this.$message.error('包装级别必须大于0')
         return
 
@@ -1000,7 +997,7 @@ export default {
 
           //如果都为空 进行补充
           if (!this.$isNotBlank(this.newProductData.sptm) && !this.$isNotBlank(this.newProductData.ybbm)) {
-            getCodeRelDetail({drugCode:row.nameCode}).then((response) => {
+            getCodeRelDetail({drugCode: row.nameCode}).then((response) => {
               if (response.code == 20000) {
                 if (response.data != null && response.data.length > 0) {
                   this.newProductData.sptm = response.data[0].sptm;
@@ -1045,10 +1042,10 @@ export default {
       }, 500)
 
     },
-    selectDrugLevelItem(row){
+    selectDrugLevelItem(row) {
       this.filterQueryDrugLevel.uuid = this.newProductData.uuid
       this.filterQueryDrugLevel.ybbm = this.newProductData.ybbm
-      this.filterQueryDrugLevel.nameCodeRow =  row.nameCode
+      this.filterQueryDrugLevel.nameCodeRow = row.nameCode
       // console.log('drug',drug)
       updateLevelDrugAli(this.filterQueryDrugLevel).then((response) => {
         if (response.code == 20000) {
@@ -1089,7 +1086,7 @@ export default {
     rowChange(index, val) {
 
 
-      if(this.editRowSwitch == true ){
+      if (this.editRowSwitch == true) {
         this.$message.error('请先保存当前产品标识编辑')
         return
       }
@@ -1170,8 +1167,8 @@ export default {
     },
 
     //判断是否特殊药品
-    checkIsSpecial(){
+    checkIsSpecial() {
-      if (this.detailList.length > 0){
+      if (this.detailList.length > 0) {
         this.detailList.forEach(item => {
           if (item.nameCode.startsWith('89')) {
             this.isSpecial = true
@@ -1318,19 +1315,18 @@ export default {
       this.chooseHouseDrugVisible = false
       this.getThirdSysDetail()
     },
-    handleInput(index, value,type){
+    handleInput(index, value, type) {
       const intValue = parseInt(value, 10);
       // 更新行的数据
-      if (type == 1){
+      if (type == 1) {
         this.$set(this.detailList[index], 'packLevel', intValue);
-      }else {
+      } else {
         this.$set(this.detailList[index], 'bhxjsl', intValue);
       }
 
     }
 
 
-
   },
   created() {
     if (this.rowData != null) {

src/views/collect/PanelOrderUpload.vue

@@ -558,10 +558,10 @@ export default {
         })
     },
     orderUpload(_this, row) {
-      if(2 === row.uploadStatus){
+      // if(2 === row.uploadStatus){
-        _this.$message.error("该单据已经上传成功无法重复上传到第三方系统")
+      //   _this.$message.error("该单据已经上传成功无法重复上传到第三方系统")
-        return;
+      //   return;
-      }
+      // }
 
       let params = row
       _this.$confirm('该订单将上传到外部系统，是否继续?', '提示', {