|
|
@@ -37,27 +37,27 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="所属公司">
|
|
|
- <el-select style="width: 240px" v-model="companyId" multiple placeholder="请选择企业" clearable size="small" >
|
|
|
- <el-option
|
|
|
- v-for="item in companyOptions"
|
|
|
- :key="item.companyId"
|
|
|
- :label="item.companyName"
|
|
|
- :value="item.companyId"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="所属店铺">
|
|
|
- <!--<el-select style="width: 240px" v-model="storeId" multiple placeholder="请选择企业" clearable size="small" >
|
|
|
- <el-option
|
|
|
- v-for="item in storeOptions"
|
|
|
- :key="item.storeId"
|
|
|
- :label="item.storeName"
|
|
|
- :value="item.storeId"
|
|
|
- />
|
|
|
- </el-select>-->
|
|
|
- <el-input :value="this.$store.state.user.name" disabled/>
|
|
|
- </el-form-item>
|
|
|
+<!-- <el-form-item label="所属公司">-->
|
|
|
+<!-- <el-select style="width: 240px" v-model="companyId" multiple placeholder="请选择企业" clearable size="small" >-->
|
|
|
+<!-- <el-option-->
|
|
|
+<!-- v-for="item in companyOptions"-->
|
|
|
+<!-- :key="item.companyId"-->
|
|
|
+<!-- :label="item.companyName"-->
|
|
|
+<!-- :value="item.companyId"-->
|
|
|
+<!-- />-->
|
|
|
+<!-- </el-select>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="所属店铺">-->
|
|
|
+<!-- <el-select style="width: 240px" v-model="storeId" multiple placeholder="请选择店铺" clearable size="small" >-->
|
|
|
+<!-- <el-option-->
|
|
|
+<!-- v-for="item in storeOptions"-->
|
|
|
+<!-- :key="item.storeId"-->
|
|
|
+<!-- :label="item.storeName"-->
|
|
|
+<!-- :value="item.storeId"-->
|
|
|
+<!-- />-->
|
|
|
+<!-- </el-select>-->
|
|
|
+<!-- <el-input :value="this.$store.state.user.name" disabled/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
<el-form-item label="审核状态">
|
|
|
<el-select style="width: 240px" v-model="isAudit" placeholder="请选择企业" size="small" >
|
|
|
<el-option value="0" label="待审核" key="isAudit0">待审核</el-option>
|
|
|
@@ -289,7 +289,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="商品名称" show-overflow-tooltip align="center" prop="productName" />
|
|
|
<el-table-column label="分类" align="center" prop="cateName" />
|
|
|
- <el-table-column label="所属公司" align="center" prop="companyName" />
|
|
|
+<!-- <el-table-column label="所属公司" align="center" prop="companyName" />-->
|
|
|
<el-table-column label="售价" align="center" prop="price" >
|
|
|
<template slot-scope="scope" >
|
|
|
<span v-if="scope.row.price!=null">{{scope.row.price.toFixed(2)}}</span>
|
|
|
@@ -368,7 +368,7 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<!-- 添加或修改商品对话框 -->
|
|
|
- <el-dialog :title="title" v-if="open" :fullscreen="isFullscreen" :visible.sync="open" width="1000px" append-to-body :show-close="false">
|
|
|
+ <el-dialog :title="title" v-if="open" :fullscreen="isFullscreen" :visible.sync="open" :before-close="handleClose" width="1000px" append-to-body :show-close="false">
|
|
|
<template v-slot:title>
|
|
|
<div style="display: flex; justify-content: space-between; align-items: center;">
|
|
|
<span>{{ title }}</span>
|
|
|
@@ -809,16 +809,16 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="所属公司">
|
|
|
- <el-select style="width: 240px" v-model="form.companyIds" multiple placeholder="请选择企业" clearable size="small" >
|
|
|
- <el-option
|
|
|
- v-for="item in companyOptions"
|
|
|
- :key="item.companyId"
|
|
|
- :label="item.companyName"
|
|
|
- :value="item.companyId"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
+<!-- <el-form-item label="所属店铺">-->
|
|
|
+<!-- <el-select style="width: 240px" v-model="form.storeId" multiple placeholder="请选择店铺" clearable size="small" >-->
|
|
|
+<!-- <el-option-->
|
|
|
+<!-- v-for="item in storeOptions"-->
|
|
|
+<!-- :key="item.storeId"-->
|
|
|
+<!-- :label="item.storeName"-->
|
|
|
+<!-- :value="item.storeId"-->
|
|
|
+<!-- />-->
|
|
|
+<!-- </el-select>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
<el-form-item label="国药准字" v-if="form.productType==2" prop="prescribeCode">
|
|
|
<el-input v-model="form.prescribeCode" placeholder="请输入国药准字" />
|
|
|
</el-form-item>
|
|
|
@@ -1150,9 +1150,9 @@ export default {
|
|
|
getCompanyList().then(response => {
|
|
|
this.companyOptions = response.data;
|
|
|
});
|
|
|
- listStore().then(response => {
|
|
|
- this.storeOptions = response.data;
|
|
|
- });
|
|
|
+ // listStore().then(response => {
|
|
|
+ // this.storeOptions = response.data;
|
|
|
+ // });
|
|
|
this.getTreeselect();
|
|
|
this.getList();
|
|
|
},
|
|
|
@@ -1474,7 +1474,9 @@ export default {
|
|
|
/** 搜索按钮操作 */
|
|
|
handleQuery() {
|
|
|
this.queryParams.pageNum = 1;
|
|
|
- this.queryParams.companyIds = this.companyId +''
|
|
|
+ if(this.companyId !== null){
|
|
|
+ this.queryParams.companyIds = this.companyId +''
|
|
|
+ }
|
|
|
this.getList();
|
|
|
},
|
|
|
/** 重置按钮操作 */
|
|
|
@@ -1638,6 +1640,13 @@ export default {
|
|
|
}).then(response => {
|
|
|
this.download(response.msg);
|
|
|
}).catch(function() {});
|
|
|
+ },
|
|
|
+ handleClose(done) {
|
|
|
+ this.$confirm('确认关闭?')
|
|
|
+ .then(_ => {
|
|
|
+ done();
|
|
|
+ })
|
|
|
+ .catch(_ => {});
|
|
|
}
|
|
|
}
|
|
|
};
|