Merge remote-tracking branch 'origin/dev' into dev

dev
郑明梁 2 years ago
commit 41269a2bd0

@ -82,11 +82,12 @@
<el-table-column type="selection" width="55" :selectable="selectable"></el-table-column> <el-table-column type="selection" width="55" :selectable="selectable"></el-table-column>
<el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column> <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
<!--<el-table-column label="主系统编码" prop="mainId" show-overflow-tooltip></el-table-column>--> <!--<el-table-column label="主系统编码" prop="mainId" show-overflow-tooltip></el-table-column>-->
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column> <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column> <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column> <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column> <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"

@ -578,7 +578,7 @@ export default {
this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code}; this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code};
} }
} }
debugger
this.subFormVisible = true; this.subFormVisible = true;
this.getSubThrsysDetailData(); this.getSubThrsysDetailData();
if (this.subData.parentCode != null && this.subData.parentCode != "") { if (this.subData.parentCode != null && this.subData.parentCode != "") {
@ -592,6 +592,7 @@ export default {
} }
filterSubAll(this.query) filterSubAll(this.query)
.then((response) => { .then((response) => {
debugger
let invList = response.data || []; let invList = response.data || [];
// //
if (invList.length > 0) { if (invList.length > 0) {

@ -71,7 +71,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click.native="editGeOrderParamVisible = !editGeOrderParamVisible" <el-button @click.native="closeDialog( editGeOrderParamVisible = !editGeOrderParamVisible)"
>取消 >取消
</el-button </el-button
> >

@ -564,7 +564,7 @@ export default {
this.subData.code = JSON.parse(localStorage.getItem("code")); this.subData.code = JSON.parse(localStorage.getItem("code"));
this.subFormVisible = false; this.subFormVisible = false;
}); });
this.resetForm(); // this.resetForm();
}, },

Loading…
Cancel
Save