Merge branch 'master_bly' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI into master_bly

src/views/hisStore/storeProduct/index.vue

@@ -47,161 +47,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="所属店铺">
-        <el-select style="width: 240px" v-model="queryParams.storeIds" 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="审核状态">
-        <el-select style="width: 240px" v-model="queryParams.isAudit" placeholder="请选择审核状态" size="small" >
-          <el-option value="0" label="待审核" key="isAudit0">待审核</el-option>
-          <el-option value="1" label="审核通过" key="isAudit1">审核通过</el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="药品注册证书编号" prop="drugRegCertNo">
-        <el-input
-          v-model="queryParams.drugRegCertNo"
-          placeholder="请输入药品注册证书编号"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="通用名称" prop="commonName">
-        <el-input
-          v-model="queryParams.commonName"
-          placeholder="请输入通用名称"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="剂型" prop="dosageForm">
-        <el-input
-          v-model="queryParams.dosageForm"
-          placeholder="请输入剂型"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="单价" prop="unitPrice">
-        <el-input
-          v-model="queryParams.unitPrice"
-          placeholder="请输入单价"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="批号" prop="batchNumber">
-        <el-input
-          v-model="queryParams.batchNumber"
-          placeholder="请输入批号"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="上市许可持有人" prop="mah">
-        <el-input
-          v-model="queryParams.mah"
-          placeholder="请输入上市许可持有人"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="持有人地址" prop="mahAddress">
-        <el-input
-          v-model="queryParams.mahAddress"
-          placeholder="请输入持有人地址"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="生产企业" prop="manufacturer">
-        <el-input
-          v-model="queryParams.manufacturer"
-          placeholder="请输入生产企业"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="生产企业地址" prop="manufacturerAddress">
-        <el-input
-          v-model="queryParams.manufacturerAddress"
-          placeholder="请输入生产企业地址"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="功能主治" prop="indications">
-        <el-input
-          v-model="queryParams.indications"
-          placeholder="请输入功能主治"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="用法用量" prop="dosage">
-        <el-input
-          v-model="queryParams.dosage"
-          placeholder="请输入用法用量"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="不良反应" prop="adverseReactions">
-        <el-input
-          v-model="queryParams.adverseReactions"
-          placeholder="请输入不良反应"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="禁忌" prop="contraindications">
-        <el-input
-          v-model="queryParams.contraindications"
-          placeholder="请输入禁忌"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="注意事项" prop="precautions">
-        <el-input
-          v-model="queryParams.precautions"
-          placeholder="请输入注意事项"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
       <!-- <el-form-item label="状态" prop="isShow">
          <el-select style="width: 240px" v-model="queryParams.isShow" placeholder="请选择状态" clearable size="small" >
          <el-option
@@ -294,7 +139,6 @@
       <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="storeName" />
       <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>
@@ -326,14 +170,6 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['store:storeProduct:edit']"
           >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="showOperLog(scope.row)"
-            v-hasPermi="['store:storeProduct:list']"
-            v-if="scope.row.isAudit===1"
-          >审核记录</el-button>
           <el-button
             size="mini"
             type="text"
@@ -425,109 +261,6 @@
           </el-col>
 
         </el-row>
-        <el-row :gutter="10">
-          <el-col :span="12">
-            <el-form-item label="是否药品" prop="isDrug">
-              <el-radio-group v-model="form.isDrug">
-                <el-radio
-                  v-for="item in isDrugOptions"
-                  :key="item.dictValue"
-                  :label="item.dictValue"
-                >{{ item.dictLabel }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div v-if="form.isDrug === '1'">
-          <el-form-item label="药品展示图" prop="drugImage">
-            <Material v-model="drugImageArr" type="image" :num="1" :width="150" :height="150" />
-          </el-form-item>
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="药品注册证书编号" prop="drugRegCertNo">
-                <el-input v-model="form.drugRegCertNo" placeholder="请输入药品注册证书编号" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="通用名称" prop="commonName">
-                <el-input v-model="form.commonName" placeholder="请输入通用名称" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="剂型" prop="dosageForm">
-                <el-input v-model="form.dosageForm" placeholder="请输入剂型" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="单价" prop="unitPrice">
-                <el-input v-model="form.unitPrice" placeholder="请输入单价" type="number" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="批号" prop="batchNumber">
-                <el-input v-model="form.batchNumber" placeholder="请输入批号" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="规格" prop="prescribeSpec">
-                <el-input v-model="form.prescribeSpec" placeholder="请输入规格" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="上市许可持有人" prop="mah">
-                <el-input v-model="form.mah" placeholder="请输入上市许可持有人" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="持有人地址" prop="mahAddress">
-                <el-input v-model="form.mahAddress" placeholder="请输入上市许可持有人地址" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="生产企业" prop="manufacturer">
-                <el-input v-model="form.manufacturer" placeholder="请输入生产企业" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="企业地址" prop="manufacturerAddress">
-                <el-input v-model="form.manufacturerAddress" placeholder="请输入生产企业地址" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-form-item label="功能主治" prop="indications">
-            <el-input v-model="form.indications" type="textarea" placeholder="请输入功能主治" />
-          </el-form-item>
-
-          <el-form-item label="用法用量" prop="dosage">
-            <el-input v-model="form.dosage" type="textarea" placeholder="请输入用法用量" />
-          </el-form-item>
-
-          <el-form-item label="不良反应" prop="adverseReactions">
-            <el-input v-model="form.adverseReactions" type="textarea" placeholder="请输入不良反应" />
-          </el-form-item>
-
-          <el-form-item label="禁忌" prop="contraindications">
-            <el-input v-model="form.contraindications" type="textarea" placeholder="请输入禁忌" />
-          </el-form-item>
-
-          <el-form-item label="注意事项" prop="precautions">
-            <el-input v-model="form.precautions" type="textarea" placeholder="请输入注意事项" />
-          </el-form-item>
-        </div>
         <el-row>
           <el-col :span="24">
             <el-form-item label="商品简介" prop="productInfo">
@@ -538,22 +271,22 @@
         <el-form-item label="商品图片" prop="image">
           <Material v-model="imageArr" type="image" :num="1" :width="150" :height="150" />
         </el-form-item>
-        <!--        <el-form-item label="商品视频" prop="video">
-                  <div>
-                    <el-upload
-                      ref="upload"
-                      class="upload-demo"
-                      :action="uploadUrl"
-                      :on-success="handleSuccess"
-                      :before-upload="beforeUpload"
-                      :limit="1"
-                      :accept="videoAccept"
-                    >
-                      <el-button size="small" type="primary">点击上传视频</el-button>
-                    </el-upload>
-                    <video v-if="form.video" :src="form.video" controls style="max-width: 300px; max-height: 300px; margin-top: 10px"></video>
-                  </div>
-                </el-form-item>-->
+        <el-form-item label="商品视频" prop="video">
+          <div>
+            <el-upload
+              ref="upload"
+              class="upload-demo"
+              :action="uploadUrl"
+              :on-success="handleSuccess"
+              :before-upload="beforeUpload"
+              :limit="1"
+              :accept="videoAccept"
+            >
+              <el-button size="small" type="primary">点击上传视频</el-button>
+            </el-upload>
+            <video v-if="form.video" :src="form.video" controls style="max-width: 300px; max-height: 300px; margin-top: 10px"></video>
+          </div>
+        </el-form-item>
         <el-form-item label="轮播图" prop="sliderImage">
           <Material v-model="photoArr" type="image" :num="10" :width="150" :height="150" />
         </el-form-item>
@@ -815,7 +548,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="商品类型" prop="productType">
-          <el-select style="width: 240px" v-model="form.productType" placeholder="请选择商品类型" clearable size="small">
+          <el-select style="width: 240px" v-model="form.productType" placeholder="请选择商品类型" clearable size="small" >
             <el-option
               v-for="item in productTypeOptions"
               :key="item.dictValue"
@@ -834,16 +567,6 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="所属店铺" prop="storeId">
-          <el-select style="width: 240px" v-model="form.storeId" 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>
@@ -915,7 +638,6 @@ import Editor from '@/components/Editor/wang';
 import Material from '@/components/Material'
 import singleImg from '@/components/Material/single'
 import { getCompanyList } from "@/api/company/company";
-import { listStore } from '@/api/hisStore/store'
 export default {
   name: "HisStoreProduct",
   components: {
@@ -929,19 +651,20 @@ export default {
       this.form.image = val.join(',')
     },
     photoArr: function(val) {
-      this.form.sliderImage = val.join(',')
-    },
-    drugImageArr: function(val) {
-      this.form.drugImage = val.join(',');
+      this.form.sliderImage = val.join(',');
+      // 验证轮播图片
+      if (val.length > 0) {
+        this.validateImage(val[val.length - 1], 'carousel');
+      } else {
+        this.carouselImageValidation.show = false;
+      }
     }
   },
   data() {
     return {
       companyId: null,
-      storeId: null,
-      isAudit: null,
       uploadUrl:process.env.VUE_APP_BASE_API+"/common/uploadOSS",
-      //videoAccept:"video/*",
+      videoAccept:"video/*",
       upload: {
         // 是否显示弹出层
         open: false,
@@ -956,15 +679,6 @@ export default {
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/store/storeProduct/importData"
       },
-      // 添加药品相关字段
-      isDrugOptions: [
-        { dictValue: "0", dictLabel: "否" },
-        { dictValue: "1", dictLabel: "是" }
-      ],
-
-      // 药品展示图
-      drugImageArr: [],
-
       productTuiCateOptions:[],
       showIput: false,
       createBnt:true,
@@ -1010,7 +724,6 @@ export default {
       categoryOptions:[],
       // 企业列表
       companyOptions:[],
-      storeOptions:[],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -1039,22 +752,7 @@ export default {
         productType: null,
         isShow: "1",
         barCode:null,
-        companyIds: null,
-        storeIds: null,
-        drugRegCertNo: null,
-        commonName: null,
-        dosageForm: null,
-        unitPrice: null,
-        batchNumber: null,
-        mah: null,
-        mahAddress: null,
-        manufacturer: null,
-        manufacturerAddress: null,
-        indications: null,
-        dosage: null,
-        adverseReactions: null,
-        contraindications: null,
-        precautions: null
+        companyIds: null
       },
       // 表单参数
       form: {},
@@ -1099,55 +797,6 @@ export default {
         companyIds: [
           { required: true, message: "销售公司不能为空", trigger: "blur" }
         ],
-        // 药品相关字段校验（仅在是药品时必填）
-        drugImage: [
-          { required: true, message: "药品展示图不能为空", trigger: "blur" }
-        ],
-        drugRegCertNo: [
-          { required: true, message: "药品注册证书编号不能为空", trigger: "blur" }
-        ],
-        commonName: [
-          { required: true, message: "通用名称不能为空", trigger: "blur" }
-        ],
-        dosageForm: [
-          { required: true, message: "剂型不能为空", trigger: "blur" }
-        ],
-        unitPrice: [
-          { required: true, message: "单价不能为空", trigger: "blur" }
-        ],
-        batchNumber: [
-          { required: true, message: "批号不能为空", trigger: "blur" }
-        ],
-        mah: [
-          { required: true, message: "上市许可持有人不能为空", trigger: "blur" }
-        ],
-        mahAddress: [
-          { required: true, message: "上市许可持有人地址不能为空", trigger: "blur" }
-        ],
-        manufacturer: [
-          { required: true, message: "生产企业不能为空", trigger: "blur" }
-        ],
-        manufacturerAddress: [
-          { required: true, message: "生产企业地址不能为空", trigger: "blur" }
-        ],
-        indications: [
-          { required: true, message: "功能主治不能为空", trigger: "blur" }
-        ],
-        dosage: [
-          { required: true, message: "用法用量不能为空", trigger: "blur" }
-        ],
-        adverseReactions: [
-          { required: true, message: "不良反应不能为空", trigger: "blur" }
-        ],
-        contraindications: [
-          { required: true, message: "禁忌不能为空", trigger: "blur" }
-        ],
-        precautions: [
-          { required: true, message: "注意事项不能为空", trigger: "blur" }
-        ],
-        storeId :[
-          { required: false, message: "所属店铺不能为空", trigger: "blur"}
-        ],
       }
     };
   },
@@ -1161,6 +810,7 @@ export default {
       this.isHotOptions = response.data;
       this.isGoodOptions=response.data;
       this.isDisplayOptions=response.data;
+      console.log(response.data)
     });
     this.getDicts("store_product_type").then((response) => {
       this.productTypeOptions = response.data;
@@ -1177,9 +827,6 @@ export default {
     getCompanyList().then(response => {
       this.companyOptions = response.data;
     });
-    listStore().then(response => {
-      this.storeOptions = response.rows;
-    });
     this.getTreeselect();
     this.getList();
   },
@@ -1211,7 +858,7 @@ export default {
     handleSuccess(response, file) {
       // 上传成功后的回调函数
       this.myloading.close();
-      //this.form.video = response.url;
+      this.form.video = response.url;
       this.$refs.upload.clearFiles();
     },
     beforeUpload(file) {
@@ -1413,7 +1060,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        productId: null,
+        productId: 0,
         image: null,
         video: null,
         sliderImage: null,
@@ -1456,25 +1103,8 @@ export default {
         prescribeName: null,
         isDisplay:"1",
         companyIds:[],
-        isDrug: "1", // 是否药品
-        drugImage: null, // 药品展示图
-        drugRegCertNo: null, // 药品注册证书编号
-        commonName: null, // 通用名称
-        dosageForm: null, // 剂型
-        unitPrice: null, // 单价
-        batchNumber: null, // 批号
-        mah: null, // 上市许可持有人
-        mahAddress: null, // 上市许可持有人地址
-        manufacturer: null, // 生产企业
-        manufacturerAddress: null, // 生产企业地址
-        indications: null, // 功能主治
-        dosage: null, // 用法用量
-        adverseReactions: null, // 不良反应
-        contraindications: null, // 禁忌
-        precautions: null // 注意事项
+        purchaseLimit: 0
       };
-      // 重置药品展示图
-      this.drugImageArr = [];
       this.resetForm("form");
       this.oneFormValidate = [
         {
@@ -1546,12 +1176,6 @@ export default {
         if(this.form.tuiCateId!=null){
           this.form.tuiCateId = response.data.tuiCateId.toString();
         }
-        // this.form.isDrug = response.data.isDrug ? response.data.isDrug.toString() : "1";
-        this.form.isDrug = response.data.isDrug === 0 ? "0" : (response.data.isDrug ? response.data.isDrug.toString() : "1");
-        if (this.form.drugImage != null) {
-          this.drugImageArr = this.form.drugImage.split(",");
-        }
-
         //组装attrs数据
         if(response.attrs!=null){
           this.attrs=[];
@@ -1602,6 +1226,7 @@ export default {
         if(this.form.sliderImage!=null){
           this.photoArr=this.form.sliderImage.split(",");
         }
+        console.log(this.oneFormValidate)
         this.open = true;
         this.title = "修改商品";
       });