代码备份,bug修复

(新增一个复制控件,需install一下)
master
anthonywj 4 years ago
parent 84ca59a200
commit 38b68a8d05

@ -1,4 +1,4 @@
{ {
"BASE_URL": "http://127.0.0.1:9996", "BASE_URL": "http://192.168.0.109:9996",
"SERVER_IP": "http://127.0.0.1:9996" "SERVER_IP": "http://192.168.0.109:9996"
} }

@ -1,6 +1,6 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>医院UDI自助管理平台</title><link rel=stylesheet href=https://unpkg.com/element-ui/lib/theme-chalk/index.css><link href=css/home.12df80ae.css rel=prefetch><link href=js/home.292e619e.js rel=prefetch><link href=css/app.0e62438b.css rel=preload as=style><link href=css/chunk-vendors.072ae084.css rel=preload as=style><link href=js/app.ec6d5dfb.js rel=preload as=script><link href=js/chunk-vendors.ac7bf19a.js rel=preload as=script><link href=css/chunk-vendors.072ae084.css rel=stylesheet><link href=css/app.0e62438b.css rel=stylesheet></head><body><div id=app></div><script src=./tinymce4.7.5/tinymce.min.js></script><script src=https://unpkg.zhimg.com/vue@2.6.14/dist/vue.runtime.min.js></script><script src=https://unpkg.zhimg.com/vuex@3.6.2/dist//vuex.min.js></script><script src=https://unpkg.zhimg.com/vue-router@3.0.1/dist/vue-router.min.js></script><script src=https://unpkg.zhimg.com/element-ui@2.15.7/lib/index.js></script><script>ga('create', 'UA-110990780-1', 'auto'); <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>医院UDI自助管理平台</title><link rel=stylesheet href=https://unpkg.com/element-ui/lib/theme-chalk/index.css><link href=css/home.5235ad9e.css rel=prefetch><link href=js/home.61c162c9.js rel=prefetch><link href=css/app.d45b912a.css rel=preload as=style><link href=css/chunk-vendors.072ae084.css rel=preload as=style><link href=js/app.329e6227.js rel=preload as=script><link href=js/chunk-vendors.d42d9cb3.js rel=preload as=script><link href=css/chunk-vendors.072ae084.css rel=stylesheet><link href=css/app.d45b912a.css rel=stylesheet></head><body><div id=app></div><script src=./tinymce4.7.5/tinymce.min.js></script><script src=https://unpkg.zhimg.com/vue@2.6.14/dist/vue.runtime.min.js></script><script src=https://unpkg.zhimg.com/vuex@3.6.2/dist//vuex.min.js></script><script src=https://unpkg.zhimg.com/vue-router@3.0.1/dist/vue-router.min.js></script><script src=https://unpkg.zhimg.com/element-ui@2.15.7/lib/index.js></script><script>ga('create', 'UA-110990780-1', 'auto');
ga('send', 'pageview'); ga('send', 'pageview');
window.addEventListener('hashchange', function () { window.addEventListener('hashchange', function () {
ga('set', 'page', window.location.href); ga('set', 'page', window.location.href);
ga('send', 'pageview'); ga('send', 'pageview');
});</script><script src=js/chunk-vendors.ac7bf19a.js></script><script src=js/app.ec6d5dfb.js></script></body></html> });</script><script src=js/chunk-vendors.d42d9cb3.js></script><script src=js/app.329e6227.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

45
package-lock.json generated

@ -19,7 +19,8 @@
"node-sass": "^6.0.1", "node-sass": "^6.0.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"pinyin": "^2.10.2", "pinyin": "^2.10.2",
"vue": "^2.5.16", "vue": "2.5.16",
"vue-clipboard2": "^0.3.3",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vue2-verify": "^1.1.5", "vue2-verify": "^1.1.5",
"vuedraggable": "^2.17.0", "vuedraggable": "^2.17.0",
@ -35,7 +36,7 @@
"babel-core": "7.0.0-bridge.0", "babel-core": "7.0.0-bridge.0",
"babel-jest": "^23.0.1", "babel-jest": "^23.0.1",
"sass-loader": "^7.0.1", "sass-loader": "^7.0.1",
"vue-template-compiler": "2.6.11" "vue-template-compiler": "2.5.16"
} }
}, },
"node_modules/@babel/code-frame": { "node_modules/@babel/code-frame": {
@ -19345,9 +19346,17 @@
"dev": true "dev": true
}, },
"node_modules/vue": { "node_modules/vue": {
"version": "2.6.14", "version": "2.5.16",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz", "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz",
"integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==" "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ=="
},
"node_modules/vue-clipboard2": {
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz",
"integrity": "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw==",
"dependencies": {
"clipboard": "^2.0.0"
}
}, },
"node_modules/vue-eslint-parser": { "node_modules/vue-eslint-parser": {
"version": "2.0.3", "version": "2.0.3",
@ -19417,9 +19426,9 @@
} }
}, },
"node_modules/vue-template-compiler": { "node_modules/vue-template-compiler": {
"version": "2.6.11", "version": "2.5.16",
"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz", "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.16.tgz",
"integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==", "integrity": "sha512-ZbuhCcF/hTYmldoUOVcu2fcbeSAZnfzwDskGduOrnjBiIWHgELAd+R8nAtX80aZkceWDKGQ6N9/0/EUpt+l22A==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"de-indent": "^1.0.2", "de-indent": "^1.0.2",
@ -37499,9 +37508,17 @@
"dev": true "dev": true
}, },
"vue": { "vue": {
"version": "2.6.14", "version": "2.5.16",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz", "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz",
"integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==" "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ=="
},
"vue-clipboard2": {
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz",
"integrity": "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw==",
"requires": {
"clipboard": "^2.0.0"
}
}, },
"vue-eslint-parser": { "vue-eslint-parser": {
"version": "2.0.3", "version": "2.0.3",
@ -37553,9 +37570,9 @@
} }
}, },
"vue-template-compiler": { "vue-template-compiler": {
"version": "2.6.11", "version": "2.5.16",
"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz", "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.16.tgz",
"integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==", "integrity": "sha512-ZbuhCcF/hTYmldoUOVcu2fcbeSAZnfzwDskGduOrnjBiIWHgELAd+R8nAtX80aZkceWDKGQ6N9/0/EUpt+l22A==",
"dev": true, "dev": true,
"requires": { "requires": {
"de-indent": "^1.0.2", "de-indent": "^1.0.2",

@ -21,7 +21,8 @@
"node-sass": "^6.0.1", "node-sass": "^6.0.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"pinyin": "^2.10.2", "pinyin": "^2.10.2",
"vue": "^2.5.16", "vue": "2.5.16",
"vue-clipboard2": "^0.3.3",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vue2-verify": "^1.1.5", "vue2-verify": "^1.1.5",
"vuedraggable": "^2.17.0", "vuedraggable": "^2.17.0",
@ -37,7 +38,7 @@
"babel-core": "7.0.0-bridge.0", "babel-core": "7.0.0-bridge.0",
"babel-jest": "^23.0.1", "babel-jest": "^23.0.1",
"sass-loader": "^7.0.1", "sass-loader": "^7.0.1",
"vue-template-compiler": "latest" "vue-template-compiler": "2.5.16"
}, },
"browserslist": [ "browserslist": [
"> 1%", "> 1%",

@ -1,4 +1,4 @@
{ {
"BASE_URL": "http://127.0.0.1:9996", "BASE_URL": "http://192.168.0.109:9996",
"SERVER_IP": "http://127.0.0.1:9996" "SERVER_IP": "http://192.168.0.109:9996"
} }

@ -41,6 +41,19 @@ export function updatetUdiInfos(query) {
}); });
} }
export function checkExitUdi(query) {
return axios({
url: "/udi/udirel/check/udi",
method: "post",
data: query
});
}
export function combineUdi(query) { export function combineUdi(query) {
return axios({ return axios({
url: "/udi/udirel/revleance", url: "/udi/udirel/revleance",

@ -12,7 +12,7 @@ import * as filters from "./filtres/index"; // 全局过滤器
import "./role"; // 权限 import "./role"; // 权限
import allTools from "./plugin/allTools"; import allTools from "./plugin/allTools";
// import Print from './plugin/print'; // import Print from './plugin/print';
import VueClipboard from 'vue-clipboard2'
// import "./mock"; // 模拟数据 // import "./mock"; // 模拟数据
import "./assets/icons/iconfont"; import "./assets/icons/iconfont";
@ -30,7 +30,7 @@ Object.keys(filters).forEach(key => {
}); });
Vue.use(allTools); Vue.use(allTools);
Vue.use(ElementUI); Vue.use(ElementUI);
Vue.use(VueClipboard)
Vue.config.productionTip = false; Vue.config.productionTip = false;
let getUrl = ""; let getUrl = "";
let startApp = function () { let startApp = function () {

@ -35,11 +35,11 @@
<el-table-column label="业务单据类型名称" prop="name" fixed></el-table-column> <el-table-column label="业务单据类型名称" prop="name" fixed></el-table-column>
<el-table-column label="业务单据类型代码" prop="action" fixed></el-table-column> <el-table-column label="业务单据类型代码" prop="action" fixed></el-table-column>
<el-table-column label="第三方单据类型" prop="originAction" fixed></el-table-column> <el-table-column label="第三方单据类型" prop="originAction" fixed></el-table-column>
<el-table-column label="单据是否启用" prop="enable" fixed> <!-- <el-table-column label="单据是否启用" prop="enable" fixed>-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ enableMap[scope.row.enable] }}</span> <!-- <span>{{ enableMap[scope.row.enable] }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="是否寄售" prop="advanceType" fixed> <el-table-column label="是否寄售" prop="advanceType" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ enableMap[scope.row.advanceType] }}</span> <span>{{ enableMap[scope.row.advanceType] }}</span>

@ -71,11 +71,11 @@
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="4" class="el-col"> <!-- <el-col :span="4" class="el-col">-->
<div class="text item"> <!-- <div class="text item">-->
<el-checkbox v-model="inputQuery.enable"></el-checkbox> <!-- <el-checkbox v-model="inputQuery.enable"></el-checkbox>-->
</div> <!-- </div>-->
</el-col> <!-- </el-col>-->
<el-col :span="4" class="el-col"> <el-col :span="4" class="el-col">
<div class="text item"> <div class="text item">
<el-checkbox v-model="inputQuery.advanceType"></el-checkbox> <el-checkbox v-model="inputQuery.advanceType"></el-checkbox>

@ -600,6 +600,66 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含批号:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
size="small"
splaceholder="请输入内容"
v-model="editQuery.scbssfbhph"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含序列号:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
size="small"
v-model="editQuery.scbssfbhxlh"
splaceholder="请输入内容"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含生产日期:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
size="small"
splaceholder="请输入内容"
v-model="editQuery.scbssfbhscrq"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含失效日期:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
v-model="editQuery.scbssfbhsxrq"
size="small"
splaceholder="请输入内容"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">

@ -595,7 +595,66 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含批号:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
size="small"
splaceholder="请输入内容"
v-model="editQuery.scbssfbhph"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含序列号:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
size="small"
v-model="editQuery.scbssfbhxlh"
splaceholder="请输入内容"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含生产日期:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
size="small"
splaceholder="请输入内容"
v-model="editQuery.scbssfbhscrq"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含失效日期:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
v-model="editQuery.scbssfbhsxrq"
size="small"
splaceholder="请输入内容"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">

@ -77,12 +77,13 @@
>查询 >查询
</el-button </el-button
> >
<el-button type="primary" size="mini" icon="search" @click="combine" <el-button type="primary" size="mini" icon="search" @click="checkCombine"
:loading="combineLoading" :loading="combineLoading"
>选入 >选入
</el-button </el-button
> >
<el-button type="primary" size="mini" icon="search" @click="combineUdiAll" v-if="relId==null" <el-button type="primary" size="mini" icon="search" @click="combineUdiAll"
v-if="relId==null"
>结果全部选入 >结果全部选入
</el-button </el-button
> >
@ -343,245 +344,294 @@
</template> </template>
<script> <script>
import {getUdiInfos, filterCompany} from "../../api/basic/udiInfo"; import {getUdiInfos, filterCompany} from "../../api/basic/udiInfo";
import {combineUdi, combineAllUdi} from "../../api/basic/udiRelevance"; import {combineUdi, combineAllUdi, checkExitUdi} from "../../api/basic/udiRelevance";
export default { export default {
name: "closeDialog", name: "closeDialog",
props: { props: {
closeDialog: { closeDialog: {
type: Function, type: Function,
required: true, required: true,
}, },
relId: { relId: {
type: Number, type: Number,
required: true, required: true,
}, },
isImport: { isImport: {
type: Object, type: Object,
required: true, required: true,
},
data: {
type: Object,
required: true,
},
},
data() {
return {
unionQuery: {
page: 1,
limit: 10,
udiCode: null,
nameCode: "",
cpmctymc: "",
ylqxzcrbarmc: null,
ggxh: "",
zczbhhzbapzbh: "",
isCheck: 1
}, },
data: { combineLoading: false,
type: Object, combineQuery: {
required: true, thirdId: "",
relId: "",
erpName: "",
keys: [],
}, },
checked: true,
udidlList: [],
erpList: [],
pageTotal: 1,
total: 1,
currentRow: null,
fromOptions: [],
loading: false,
erpLloading: false,
multipleUdiSelection: [],
};
},
methods: {
searchList() {
this.unionQuery.page = 1;
this.getList();
}, },
data() { getList() {
return { if (
unionQuery: { this.unionQuery.udiCode == "" &&
page: 1, this.unionQuery.nameCode == "" &&
limit: 10, this.unionQuery.cpmctymc == "" &&
udiCode: null, this.unionQuery.ylqxzcrbarmc == "" &&
nameCode: "", this.unionQuery.ggxh == "" &&
cpmctymc: "", this.unionQuery.zczbhhzbapzbh == ""
ylqxzcrbarmc: null, ) {
ggxh: "", this.$message.warning("请输入查询条件");
zczbhhzbapzbh: "", return;
isCheck: 1 }
}, this.loading = true;
combineLoading: false, // this.unionQuery.page = 1;
combineQuery: { getUdiInfos(this.unionQuery)
thirdId: "", .then((response) => {
relId: "", this.loading = false;
erpName: "", if (response.code == 20000) {
keys: [], this.udidlList = response.data.list || [];
}, this.total = response.data.total || 0;
checked: true, } else {
udidlList: [], this.$message.error(response.message);
erpList: [], }
pageTotal: 1,
total: 1,
currentRow: null,
fromOptions: [],
loading: false,
erpLloading: false,
multipleUdiSelection: [],
};
},
methods: {
searchList() {
this.unionQuery.page = 1;
this.getList();
},
getList() { })
if ( .catch(() => {
this.unionQuery.udiCode == "" && this.loading = false;
this.unionQuery.nameCode == "" && this.udidlList = [];
this.unionQuery.cpmctymc == "" && this.total = 0;
this.unionQuery.ylqxzcrbarmc == "" && });
this.unionQuery.ggxh == "" && },
this.unionQuery.zczbhhzbapzbh == ""
) {
this.$message.warning("请输入查询条件");
return;
}
this.loading = true;
// this.unionQuery.page = 1;
getUdiInfos(this.unionQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.udidlList = response.data.list || [];
this.total = response.data.total || 0;
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.udidlList = [];
this.total = 0;
});
},
combineUdiAll() { combineUdiAll() {
this.$confirm("此操作将在后台自动下载所有查询结果, 是否继续?", "提示", { this.$confirm("此操作将在后台自动下载所有查询结果, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
})
.then(() => {
combineAllUdi(this.unionQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success(response.data);
this.$emit("closeUdi", true);
} else {
this.$message.error(response.message);
}
})
.catch(() => {
});
}) })
.then(() => { .catch(() => {
combineAllUdi(this.unionQuery) });
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success(response.data);
this.$emit("closeUdi", true);
} else {
this.$message.error(response.message);
}
})
.catch(() => {
});
})
.catch(() => {
});
}, },
keyup_submit(event) { keyup_submit(event) {
this.unionQuery.page = 1; this.unionQuery.page = 1;
this.getList(); this.getList();
event.target.select(); event.target.select();
}, },
checkSelectable(row) { checkSelectable(row) {
return !row.check; return !row.check;
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.unionQuery.page = val; this.unionQuery.page = val;
this.getList(); this.getList();
}, },
tableRowClassName({row, rowIndex}) { tableRowClassName({row, rowIndex}) {
if (row.check) return "warning-row"; if (row.check) return "warning-row";
return ""; return "";
}, },
handleErpChange(val) { handleErpChange(val) {
console.log(val); console.log(val);
this.currentRow = val; this.currentRow = val;
}, },
intentBack() { intentBack() {
this.closeDialog(); this.closeDialog();
}, },
combine() {
checkCombine() {
let selectData = this.multipleUdiSelection; let selectData = this.multipleUdiSelection;
let selected = null; let selected = null;
if (this.multipleUdiSelection.length == 0) { if (this.multipleUdiSelection.length == 0) {
if (this.relId != null) { if (this.relId != null) {
this.combineQuery.relId = this.relId; this.combineQuery.relId = this.relId;
this.combineQuery.keys.push(this.currentRow.uuid); this.combineQuery.keys.push(this.currentRow.uuid);
if (this.currentRow.check) { if (this.currentRow.check) {
selected = this.currentRow; selected = this.currentRow;
} }
} else } else
return;
} else {
selectData.forEach((obj) => {
if (obj.check) {
selected = obj;
}
this.combineQuery.keys.push(obj.uuid);
});
}
if (selected != null) {
this.$message.warning("UDI编码" + selected.nameCode + "已被选入");
return; return;
}
this.combineLoading = true; } else {
combineUdi(this.combineQuery) selectData.forEach((obj) => {
.then((response) => { if (obj.check) {
this.combineLoading = false; selected = obj;
if (response.code == 20000) { }
this.$emit("closeUdi", true); this.combineQuery.keys.push(obj.uuid);
} else { });
this.$emit("closeUdi", false); }
} if (selected != null) {
}) this.$message.warning("UDI编码" + selected.nameCode + "已被选入");
.catch(() => { return;
this.combineLoading = false; }
this.combineLoading = true;
checkExitUdi(this.combineQuery)
.then((response) => {
this.combineLoading = false;
if (response.code == 20000) {
this.combine();
// combineUdi(this.combineQuery)
// .then((response) => {
// this.combineLoading = false;
// if (response.code == 20000) {
// this.$emit("closeUdi", true);
// } else {
// this.$emit("closeUdi", false);
// }
// })
// .catch(() => {
// this.combineLoading = false;
// this.$emit("closeUdi", false);
// });
} else if (response.code == 499) {
this.$confirm(response.message,{type:"warning"})
.then(_ => {
this.combine();
// combineUdi(this.combineQuery)
// .then((response) => {
// this.combineLoading = false;
// if (response.code == 20000) {
// this.$emit("closeUdi", true);
// } else {
// this.$emit("closeUdi", false);
// }
// })
// .catch(() => {
// this.combineLoading = false;
// this.$emit("closeUdi", false);
// });
})
.catch(_ => {});
}
})
.catch(() => {
this.combineLoading = false;
this.$emit("closeUdi", false);
});
},
combine() {
combineUdi(this.combineQuery)
.then((response) => {
this.combineLoading = false;
if (response.code == 20000) {
this.$emit("closeUdi", true);
} else {
this.$emit("closeUdi", false); this.$emit("closeUdi", false);
}); }
}, })
.catch(() => {
this.combineLoading = false;
this.$emit("closeUdi", false);
});
},
handleSelectionUdiChange(val) { handleSelectionUdiChange(val) {
console.log("----" + val); console.log("----" + val);
this.multipleUdiSelection = val; this.multipleUdiSelection = val;
}, },
findMethod(query) { findMethod(query) {
console.log(query); console.log(query);
let cQuery = { let cQuery = {
ylqxzcrbarmc: query, ylqxzcrbarmc: query,
page: 1, page: 1,
limit: 10, limit: 10,
}; };
filterCompany(cQuery) filterCompany(cQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
this.fromOptions = response.data || []; this.fromOptions = response.data || [];
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
this.fromOptions = []; this.fromOptions = [];
}); });
},
}, },
}; },
};
</script> </script>
<style scoped> <style scoped>
.checkitemTag { .checkitemTag {
float: left; float: left;
text-align: left; text-align: left;
margin-top: 5px; margin-top: 5px;
width: 100%; width: 100%;
} }
div /deep/ .el-table .warning-row { div /deep/ .el-table .warning-row {
background: #bebebe; background: #bebebe;
} }
div /deep/ .el-table .success-row { div /deep/ .el-table .success-row {
background: #ffffff; background: #ffffff;
} }
.el-card { .el-card {
margin-right: 20px; margin-right: 20px;
/*transition: all .5s;*/ /*transition: all .5s;*/
} }
.query-form-item { .query-form-item {
display: block !important; display: block !important;
margin-right: 10px; margin-right: 10px;
margin-bottom: 5px; margin-bottom: 5px;
} }
</style> </style>

@ -610,7 +610,66 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含批号:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
size="small"
splaceholder="请输入内容"
v-model="editQuery.scbssfbhph"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含序列号:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
size="small"
v-model="editQuery.scbssfbhxlh"
splaceholder="请输入内容"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含生产日期:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
size="small"
splaceholder="请输入内容"
v-model="editQuery.scbssfbhscrq"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含失效日期:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
v-model="editQuery.scbssfbhsxrq"
size="small"
splaceholder="请输入内容"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
@ -1073,7 +1132,66 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含批号:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
size="small"
splaceholder="请输入内容"
v-model="editQuery.scbssfbhph"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含序列号:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
size="small"
v-model="editQuery.scbssfbhxlh"
splaceholder="请输入内容"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含生产日期:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
size="small"
splaceholder="请输入内容"
v-model="editQuery.scbssfbhscrq"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>是否包含失效日期:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
v-model="editQuery.scbssfbhsxrq"
size="small"
splaceholder="请输入内容"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
</el-col> </el-col>

@ -51,6 +51,7 @@
highlight-current-row highlight-current-row
@row-click="loadLinkData" @row-click="loadLinkData"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"> :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column <el-table-column
prop="code" prop="code"
label="仓库编码" label="仓库编码"
@ -136,11 +137,12 @@
:data="userData" :data="userData"
stripe stripe
style="width: 100%"> style="width: 100%">
<el-table-column <el-table-column label="序号" type="index"></el-table-column>
prop="username" <!-- <el-table-column-->
label="账号" <!-- prop="username"-->
min-width="20%"> <!-- label="账号"-->
</el-table-column> <!-- min-width="20%">-->
<!-- </el-table-column>-->
<el-table-column <el-table-column
prop="employeeName" prop="employeeName"
label="用户名" label="用户名"
@ -156,7 +158,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
min-width="10%" min-width="30%"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -184,19 +186,20 @@
:data="bussinessTypeData" :data="bussinessTypeData"
stripe stripe
style="width: 100%"> style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
prop="action" prop="action"
label="单据类型编码" label="单据类型编码"
min-width="50%"> min-width="30%">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="单据类型名称" label="单据类型名称"
min-width="50%"> min-width="30%">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
min-width="10%" min-width="20%"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -640,6 +643,7 @@ export default {
// if (data && data.id) { // if (data && data.id) {
// this.index = this.mergeList.findIndex((d) => d.id === data.id); // this.index = this.mergeList.findIndex((d) => d.id === data.id);
// } // }
this.getParentInv(this.formData.level);
}, },
handleSubForm(node, data, formName) { handleSubForm(node, data, formName) {

@ -483,8 +483,13 @@
<!--</el-button--> <!--</el-button-->
<!--&gt;--> <!--&gt;-->
<el-button class="tag-read" type="primary" size="mini" :data-clipboard-text="acoountInfo" @click="copy"> <!-- <el-button class="tag-read" type="primary" size="mini" :data-clipboard-text="acoountInfo" @click="copy">-->
复制 <!-- 确定-->
<!-- </el-button>-->
<el-button class="tag-read" type="primary" size="mini"
v-clipboard:copy="acoountInfo"
>复制
</el-button> </el-button>
</div> </div>
@ -507,7 +512,7 @@ import {
CodeToText, CodeToText,
TextToCode, TextToCode,
} from "element-china-area-data"; } from "element-china-area-data";
import Clipboard from 'clipboard' import Clipboard from 'clipboard';
import {BASE_URL} from "../../config/app"; import {BASE_URL} from "../../config/app";
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain" import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
import {getCorps} from "@/api/thrsys/thrCorps"; import {getCorps} from "@/api/thrsys/thrCorps";
@ -721,7 +726,8 @@ export default {
copy() { copy() {
let sel = this; let sel = this;
var clipboard = new Clipboard('.tag-read') let clipboard = new Clipboard('.tag-read');
clipboard.on('success', e => { clipboard.on('success', e => {
console.log('复制成功') console.log('复制成功')
// //
@ -733,7 +739,7 @@ export default {
// //
clipboard.destroy() clipboard.destroy()
}); });
this.$confirm("账号密码复制成功!是否跳转登录", "提示", { this.$confirm("账号已复制,请牢记自己的账号密码!是否跳转登录", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",

Loading…
Cancel
Save