diff --git a/.env.production b/.env.production index 0ec3f0e..81b3bb8 100644 --- a/.env.production +++ b/.env.production @@ -17,13 +17,13 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' # 文明懂 -VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' # 刘恩典 # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_SPMS_SERVER/' # 漳州中医院 -# VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/' +VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/' # 应用访问路径 例如使用前缀 /admin/ diff --git a/src/views/basic/locUdi/UdiInfoDb.vue b/src/views/basic/locUdi/UdiInfoDb.vue index b803483..5e02106 100644 --- a/src/views/basic/locUdi/UdiInfoDb.vue +++ b/src/views/basic/locUdi/UdiInfoDb.vue @@ -9,7 +9,6 @@ <el-input v-model="unionQuery.udiCode" placeholder="请扫描或输入UDI码" clearable="true" - @keyup.enter.native="keyup_submit($event)"></el-input> </el-form-item> </el-col> diff --git a/src/views/inout/DialogSelectProduct.vue b/src/views/inout/DialogSelectProduct.vue index bc144f9..5856c65 100644 --- a/src/views/inout/DialogSelectProduct.vue +++ b/src/views/inout/DialogSelectProduct.vue @@ -140,7 +140,10 @@ <el-form :model="form"> <el-form-item label="" prop="isGive"> <el-radio-group v-model="currentCert"> - <el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio> + <el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{ + item + }} + </el-radio> </el-radio-group> </el-form-item> </el-form> @@ -282,7 +285,7 @@ export default { return; } let str = this.currentRow.zczbhhzbapzbh; - if (str.search(",") != -1) { + if (this.$isNotBlank(str) && str.search(",") != -1) { this.currentCert = null; this.certList = str.split(','); this.dialogFormVisible = true; diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue index 18c7475..884aaac 100644 --- a/src/views/inout/PanelCreateOrderBizDetail.vue +++ b/src/views/inout/PanelCreateOrderBizDetail.vue @@ -102,6 +102,12 @@ prop="certCode" show-overflow-tooltip > + <template slot-scope="scope"> + <el-input v-model="scope.row.certCode" + :disabled="scope.row.index !== selectedIndex" + placeholder="注册/备案号" + ></el-input> + </template> </el-table-column> <el-table-column width="150" label="生产企业"