diff --git a/.env.production b/.env.production
index cb877b81..15e46cb6 100644
--- a/.env.production
+++ b/.env.production
@@ -8,7 +8,7 @@ ENV = 'production'
#林纪裕cd
-VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
@@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
# 平潭正式
-# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# 吴总测试服务器
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
diff --git a/package.json b/package.json
index 49aa5485..06489e3f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "ruoyi-vue-plus",
"version": "4.3.0",
"description": "UDI自助平台",
- "author": "LionLi",
+ "author": "Glxp",
"license": "MIT",
"scripts": {
"dev": "vue-cli-service serve",
@@ -76,7 +76,7 @@
"connect": "3.6.6",
"eslint": "7.15.0",
"eslint-plugin-vue": "7.2.0",
- "html-webpack-plugin": "^5.5.1",
+ "html-webpack-plugin": "4.5.2",
"lint-staged": "10.5.3",
"runjs": "4.4.2",
"sass": "1.32.13",
diff --git a/src/api/thrsys/thrProducts.js b/src/api/thrsys/thrProducts.js
index 4a570a17..76d17b2d 100644
--- a/src/api/thrsys/thrProducts.js
+++ b/src/api/thrsys/thrProducts.js
@@ -40,3 +40,12 @@ export function saveNewProduct(data) {
data: data
})
}
+
+export function updateProduct(data) {
+ return axios({
+ url: '/udiwms/udiinfo/erp/products/update',
+ method: 'post',
+ data: data
+ })
+}
+
diff --git a/src/assets/images/login-background.jpg b/src/assets/images/login-background.jpg
deleted file mode 100644
index 8a89eb82..00000000
Binary files a/src/assets/images/login-background.jpg and /dev/null differ
diff --git a/src/assets/images/profile.jpg b/src/assets/images/profile.jpg
deleted file mode 100644
index b3a940b2..00000000
Binary files a/src/assets/images/profile.jpg and /dev/null differ
diff --git a/src/views/login.vue b/src/views/login.vue
index 916a8a73..6f7dd6e9 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -162,7 +162,7 @@ export default {
justify-content: center;
align-items: center;
height: 100%;
- background-image: url("../assets/images/login-background.jpg");
+ background-image: url("../assets/login.jpg");
background-size: cover;
}
diff --git a/src/views/register.vue b/src/views/register.vue
index 3f21986a..eb55503c 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -154,7 +154,7 @@ export default {
justify-content: center;
align-items: center;
height: 100%;
- background-image: url("../assets/images/login-background.jpg");
+ background-image: url("../assets/login.jpg");
background-size: cover;
}
.title {
diff --git a/src/views/thirdSys/product/thrProducts.vue b/src/views/thirdSys/product/thrProducts.vue
index bd9647a3..f56c6680 100644
--- a/src/views/thirdSys/product/thrProducts.vue
+++ b/src/views/thirdSys/product/thrProducts.vue
@@ -5,7 +5,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="产品编码:">
- <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入产品编码/商品条码/医保编码" clearable @keyup.enter.native="keyupErp_submit($event)"></el-input>
+ <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入产品编码/商品条码/医保编码" clearable
+ @keyup.enter.native="keyupErp_submit($event)"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -22,7 +23,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="注册/备案凭证:">
- <el-input v-model="filterQuery.registerNo" clearable style="width: 90%" placeholder="请输入注册/备案凭证"></el-input>
+ <el-input v-model="filterQuery.registerNo" clearable style="width: 90%"
+ placeholder="请输入注册/备案凭证"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -48,14 +50,16 @@
</el-col>
</el-row>
</el-form>
- <div class="top-right-btn">
- <el-button-group style="display:flex;">
- <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
- <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
- <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
- <el-button type="primary" icon="el-icon-plus" @click="addProductVisible=true" :disabled="!configParms.basicThirdProducts">新增</el-button>
- </el-button-group>
- </div>
+ <div class="top-right-btn">
+ <el-button-group style="display:flex;">
+ <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+ <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+ <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+ <el-button type="primary" icon="el-icon-plus" @click="addProductVisible=true"
+ :disabled="!configParms.basicThirdProducts">新增
+ </el-button>
+ </el-button-group>
+ </div>
<el-divider style="margin: 15px"></el-divider>
@@ -69,8 +73,9 @@
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="180px">
<template slot-scope="scope">
- <el-button type="text" @click.native.stop="detailDialog(scope.row)">详情</el-button>
- <el-button type="text" @click.native.stop="deleteDialog(scope.row)" v-if="thirdSysDetail.fromType!=0" :disabled="!configParms.basicThirdProducts">删除
+ <el-button type="text" @click.native.stop="detailDialog(scope.row)">编辑</el-button>
+ <el-button type="text" @click.native.stop="deleteDialog(scope.row)" v-if="thirdSysDetail.fromType!=0"
+ :disabled="!configParms.basicThirdProducts">删除
</el-button>
</template>
</el-table-column>
@@ -89,16 +94,17 @@
<el-dialog
:close-on-click-modal="false"
:close-on-press-escape="false"
- title="产品信息详情"
+ title="产品信息编辑"
:visible.sync="thrProductsDetailVisible"
width="60%"
class="dialog-two"
top="5vh"
v-if="thrProductsDetailVisible"
>
- <thrProductsDetail
- :data="thisData"
- ></thrProductsDetail>
+ <thrProductsEdit
+ :newProductData="thisData"
+ :closeAddDialog="closeAddDialog"
+ ></thrProductsEdit>
</el-dialog>
<el-dialog
@@ -120,12 +126,13 @@
</div>
</template>
<script>
-import {delThrProducts, saveNewProduct
+import {
+ delThrProducts, saveNewProduct
} from "@/api/thrsys/thrProducts";
import {getInvbasdoc} from "@/api/thrsys/getErps";
import {getBasicThirdSys, filterDetailByKey} from "@/api/thrsys/basicThirdSys";
import {selectIp} from "@/api/system/systemParamConfig";
-import thrProductsDetail from "./thrProductsDetail";
+import thrProductsEdit from "./thrProductsEdit";
import ThrProductsAdd from "@/views/thirdSys/product/thrProductsAdd";
import {findConfig} from "@/api/sync/spsSyncStatus";
@@ -143,7 +150,7 @@ export default {
page: 1,
limit: 20,
},
- mainThirdSys:'',
+ mainThirdSys: '',
total: 0,
thirdSys: [],
thirdSysDetail: null,
@@ -206,7 +213,7 @@ export default {
this.getList();
},
getList() {
- if (this.filterQuery.thirdSys == null ) {
+ if (this.filterQuery.thirdSys == null) {
this.$message.warning("请先选择第三方系统！")
return;
}
@@ -268,8 +275,8 @@ export default {
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
- for(var i=0;i<this.thirdSys.length;i++){
- if(this.thirdSys[i].mainSys){
+ for (var i = 0; i < this.thirdSys.length; i++) {
+ if (this.thirdSys[i].mainSys) {
this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId;
}
@@ -316,6 +323,7 @@ export default {
})
},
closeAddDialog(val) {
+ this.thrProductsDetailVisible = false;
this.addProductVisible = false;
if (val) {
this.getList();
@@ -334,7 +342,7 @@ export default {
},
},
components: {
- thrProductsDetail, ThrProductsAdd
+ thrProductsEdit, ThrProductsAdd
},
mounted() {
},
diff --git a/src/views/thirdSys/product/thrProductsEdit.vue b/src/views/thirdSys/product/thrProductsEdit.vue
new file mode 100644
index 00000000..323f0ac3
--- /dev/null
+++ b/src/views/thirdSys/product/thrProductsEdit.vue
@@ -0,0 +1,221 @@
+<template>
+ <el-form :model="newProductData" label-width="120px">
+ <el-row type="flex">
+ <el-col :span="11" type="flex">
+ <el-form-item label="第三方系统" prop="thirdSysFk">
+ <el-select
+ style="width: 90%"
+ disabled
+ v-model="newProductData.thirdSysFk" placeholder="请选择第三方系统"
+ >
+ <el-option
+ v-for="item in thirdSys"
+ :key="item.value"
+ :label="item.thirdName"
+ :value="item.thirdId">
+ <span style="float: left">{{ item.thirdName }}</span>
+ <span style="float: right; color: #8492a6; font-size: 13px">{{
+ item.thirdId
+ }}</span>
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row type="flex">
+ <el-col :span="11" type="flex">
+ <el-form-item label="产品编码:" prop="code">
+ <el-input style="width: 90%" size="small" placeholder="请输入产品编码"
+ disabled
+ v-model.trim="newProductData.code"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" type="flex">
+ <el-form-item label="产品名称:" prop="name">
+ <el-input style="width: 90%" size="small" placeholder="请输入产品名称" v-model.trim="newProductData.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row type="flex">
+ <el-col :span="11" class="el-col">
+ <el-form-item label="规格型号:" prop="spec">
+ <el-input style="width: 90%" size="small" placeholder="请输入规格型号" v-model.trim="newProductData.spec"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="el-col">
+ <el-form-item label="计量单位:" prop="measname">
+ <el-input style="width: 90%" size="small" placeholder="请输入计量单位"
+ v-model.trim="newProductData.measname"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row type="flex">
+ <el-col :span="11" class="el-col">
+ <el-form-item label="生产企业:" prop="manufactory">
+ <el-input style="width: 90%" size="small" placeholder="请输入生产企业"
+ v-model.trim="newProductData.manufactory"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="el-col">
+ <el-form-item label="注册证号:" prop="registerNo">
+ <el-input style="width: 90%" size="small" placeholder="请输入注册证号"
+ v-model.trim="newProductData.registerNo"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row type="flex">
+ <el-col :span="11" class="el-col">
+ <el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc">
+ <el-input style="width: 90%" size="small" placeholder="请输入医疗器械注册人"
+ v-model.trim="newProductData.ylqxzcrbarmc"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="el-col">
+ <el-form-item label="注册人英文名称:" prop="ylqxzcrbarywmc">
+ <el-input style="width: 90%" size="small" placeholder="请输入注册人英文名称"
+ v-model.trim="newProductData.ylqxzcrbarywmc"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row type="flex">
+ <el-col :span="11" class="el-col">
+ <el-form-item label="产品类别:" prop="cplb">
+ <el-input style="width: 90%" size="small" placeholder="请输入产品类别" v-model.trim="newProductData.cplb"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="el-col">
+ <el-form-item label="分类编码:" prop="flbm">
+ <el-input style="width: 90%" size="small" placeholder="请输入分类编码" v-model.trim="newProductData.flbm"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row type="flex">
+ <el-col :span="11" class="el-col">
+ <el-form-item label="商品条码:" prop="sptm">
+ <el-input style="width: 90%" size="small" placeholder="请输入商品条码" v-model.trim="newProductData.sptm"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="el-col">
+ <el-form-item label="医保编码:" prop="ybbm">
+ <el-input style="width: 90%" size="small" placeholder="请输入医保编码" v-model.trim="newProductData.ybbm"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row type="flex">
+ <el-col :span="11" class="el-col">
+ <el-form-item label="统一社会信用号:" prop="tyshxydm">
+ <el-input style="width: 90%" size="small" placeholder="请输入统一社会信用号"
+ v-model.trim="newProductData.tyshxydm"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="el-col">
+ <el-form-item label="器械类别:" prop="qxlb">
+ <el-input style="width: 90%" size="small" placeholder="请输入器械类别" v-model.trim="newProductData.qxlb"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row type="flex">
+ <el-col :span="23" class="el-col">
+ <el-form-item label="产品描述:" prop="cpms">
+ <el-input style="width: 92%" type="textarea" size="mini" rows="3" placeholder="请输入产品描述"
+ v-model.trim="newProductData.cpms"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <div style='text-align: center; margin-bottom: 10px;'>
+ <el-button type="primary" @click="saveNewProduct">提交</el-button>
+ <el-button type="primary" @click="closeAddDialog">取消</el-button>
+ </div>
+ </el-form>
+</template>
+
+<script>
+import {updateProduct} from "@/api/thrsys/thrProducts";
+
+
+import {getBasicThirdSys} from "@/api/thrsys/basicThirdSys";
+
+export default {
+ name: "thrProductsEdit",
+ props: {
+ newProductData: {
+ type: Object,
+ required: true,
+ },
+ closeAddDialog: {
+ type: Function,
+ required: true,
+ },
+ },
+ data() {
+ return {
+ thirdSys: [],
+ }
+
+ },
+ methods: {
+ saveNewProduct() {
+ this.addProductVisible = false;
+ if (this.$isBlank(this.newProductData.thirdSysFk)) {
+ this.$message.warning("第三方系统不能为空！");
+ return;
+ }
+ if (this.$isBlank(this.newProductData.code)) {
+ this.$message.warning("产品编码为空！");
+ return;
+ }
+ if (this.$isBlank(this.newProductData.name)) {
+ this.$message.warning("产品名称不能为空！");
+ return;
+ }
+
+ if (this.$isBlank(this.newProductData.spec)) {
+ this.$message.warning("规格型号不能为空");
+ return;
+ }
+ if (this.$isBlank(this.newProductData.measname)) {
+ this.$message.warning("计量单位不能为空！");
+ return;
+ }
+ if (this.$isBlank(this.newProductData.manufactory)) {
+ this.$message.warning("生产企业不能为空！");
+ return;
+ }
+ if (this.$isBlank(this.newProductData.registerNo)) {
+ this.$message.warning("注册证号不能为空！");
+ return;
+ }
+ updateProduct(this.newProductData).then((res) => {
+ if (res.code == 20000) {
+ this.$message.success("添加成功");
+ this.closeAddDialog(true);
+ } else {
+ this.$message.error(res.message);
+ }
+ }).catch((error) => {
+ })
+
+ },
+ getBasicThirdSys() {
+ let query = {
+ enabled: true,
+ };
+ getBasicThirdSys(query)
+ .then((response) => {
+ this.thirdSys = response.data.list || [];
+ })
+ .catch(() => {
+ this.loading = false;
+ this.list = [];
+ });
+ },
+ },
+ created() {
+ this.getBasicThirdSys();
+ },
+}
+</script>
+
+<style scoped>
+</style>