|
|
@@ -343,7 +343,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="同步状态" align="center" prop="pushStatus" >
|
|
|
<template slot-scope="scope">
|
|
|
- <el-tag
|
|
|
+ <el-tag
|
|
|
:type="scope.row.pushStatus === 1 ? 'success' : scope.row.pushStatus === 2 ? 'danger' : 'warning'"
|
|
|
>
|
|
|
{{ scope.row.pushStatus === 0 ? '推送中' : scope.row.pushStatus === 1 ? '成功' : scope.row.pushStatus === 2 ? '失败' : '未同步' }}
|
|
|
@@ -858,16 +858,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.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="所属店铺" prop="storeId" v-if="medicalMallConfig.isStores">
|
|
|
<el-select style="width: 240px" v-model="form.storeId" placeholder="请选择店铺" clearable size="small" >
|
|
|
<el-option
|
|
|
@@ -1119,7 +1119,7 @@ export default {
|
|
|
productType: null,
|
|
|
isShow: "1",
|
|
|
barCode:null,
|
|
|
- companyIds: null,
|
|
|
+ // companyIds: null,
|
|
|
storeIds: null,
|
|
|
drugRegCertNo: null,
|
|
|
commonName: null,
|
|
|
@@ -1176,9 +1176,9 @@ export default {
|
|
|
prescribeName: [
|
|
|
{ required: true, message: "处方药不能为空", trigger: "blur" }
|
|
|
],
|
|
|
- companyIds: [
|
|
|
- { required: true, message: "销售公司不能为空", trigger: "blur" }
|
|
|
- ],
|
|
|
+ // companyIds: [
|
|
|
+ // { required: true, message: "销售公司不能为空", trigger: "blur" }
|
|
|
+ // ],
|
|
|
// 药品相关字段校验(仅在是药品时必填)
|
|
|
drugImage: [
|
|
|
{ required: true, message: "药品展示图不能为空", trigger: "blur" }
|
|
|
@@ -1240,7 +1240,7 @@ export default {
|
|
|
param.productId = this.ids;
|
|
|
param.goodsStatus = this.form1.isShow;
|
|
|
param.goodsIsShow = this.form1.isDisplay;
|
|
|
- param.companyIds = this.companyId+''
|
|
|
+ // param.companyIds = this.companyId+''
|
|
|
batchModify(param).then(res=>{
|
|
|
if(res.code === 200){
|
|
|
this.$message.success("批量修改成功");
|
|
|
@@ -1503,7 +1503,7 @@ export default {
|
|
|
prescribeFactory: null,
|
|
|
prescribeName: null,
|
|
|
isDisplay:"1",
|
|
|
- companyIds:[],
|
|
|
+ // companyIds:[],
|
|
|
isDrug: "1", // 是否药品
|
|
|
drugImage: null, // 药品展示图
|
|
|
drugRegCertNo: null, // 药品注册证书编号
|
|
|
@@ -1547,7 +1547,7 @@ export default {
|
|
|
/** 搜索按钮操作 */
|
|
|
handleQuery() {
|
|
|
this.queryParams.pageNum = 1;
|
|
|
- this.queryParams.companyIds = this.companyId +''
|
|
|
+ // this.queryParams.companyIds = this.companyId +''
|
|
|
this.getList();
|
|
|
},
|
|
|
/** 重置按钮操作 */
|
|
|
@@ -1608,10 +1608,10 @@ export default {
|
|
|
that.attrs.push(data);
|
|
|
});
|
|
|
}
|
|
|
- // 组装companyIds
|
|
|
- if (response.data.companyIds != null && response.data.companyIds != undefined && response.data.companyIds.length > 0) {
|
|
|
- this.form.companyIds = response.data.companyIds.split(',').map(Number);
|
|
|
- }
|
|
|
+ // // 组装companyIds
|
|
|
+ // if (response.data.companyIds != null && response.data.companyIds != undefined && response.data.companyIds.length > 0) {
|
|
|
+ // this.form.companyIds = response.data.companyIds.split(',').map(Number);
|
|
|
+ // }
|
|
|
setTimeout(() => {
|
|
|
that.generate();
|
|
|
}, 200);
|
|
|
@@ -1668,10 +1668,10 @@ export default {
|
|
|
if(this.form.specType === 1 && this.manyFormValidate.length===0){
|
|
|
return this.$message.warning('请点击生成规格!');
|
|
|
}
|
|
|
- // 组装companyIds
|
|
|
- if (this.form.companyIds != null && this.form.companyIds != undefined) {
|
|
|
- this.form.companyIds = this.form.companyIds.join(',');
|
|
|
- }
|
|
|
+ // // 组装companyIds
|
|
|
+ // if (this.form.companyIds != null && this.form.companyIds != undefined) {
|
|
|
+ // this.form.companyIds = this.form.companyIds.join(',');
|
|
|
+ // }
|
|
|
addOrEdit(this.form).then(response => {
|
|
|
if (response.code === 200) {
|
|
|
this.msgSuccess("修改成功");
|