chenguo пре 1 недеља
родитељ
комит
05d7f6fe5a

+ 0 - 1
src/components/Material/index.vue

@@ -270,7 +270,6 @@ export default {
       this.materialGroupLoading = true;
       getAllMaterialGroup({}).then(response => {
         this.materialGroupList = response.data
-        console.log(this.materialGroupList)
         this.materialGroupLoading = false;
       });
     },

+ 0 - 1
src/components/Material/single.vue

@@ -261,7 +261,6 @@ export default {
       this.materialGroupLoading = true;
       getAllMaterialGroup({}).then(response => {
         this.materialGroupList = response.data
-        console.log(this.materialGroupList)
         this.materialGroupLoading = false;
       });
     },

+ 3 - 5
src/views/hisStore/storeProduct/index.vue

@@ -294,6 +294,7 @@
       <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>
@@ -833,7 +834,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="所属店铺">
+        <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"
@@ -1146,7 +1147,7 @@ export default {
         ],
         storeId :[
           { required: true, message: "所属店铺不能为空", trigger: "blur"}
-        ]
+        ],
       }
     };
   },
@@ -1160,7 +1161,6 @@ 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;
@@ -1399,7 +1399,6 @@ export default {
     /** 查询商品列表 */
     getList() {
       this.loading = true;
-      console.log(this.queryParams)
       listStoreProduct(this.queryParams).then(response => {
         this.storeProductList = response.rows;
         this.total = response.total;
@@ -1603,7 +1602,6 @@ export default {
         if(this.form.sliderImage!=null){
           this.photoArr=this.form.sliderImage.split(",");
         }
-        console.log(this.oneFormValidate)
         this.open = true;
         this.title = "修改商品";
       });

+ 16 - 7
src/views/hisStore/storeProductAudit/index.vue

@@ -120,6 +120,7 @@
       <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>
@@ -632,16 +633,27 @@
                   />
             </el-select>
         </el-form-item>
-        <el-form-item label="国药准字" v-if="form.productType==2" prop="prescribeCode">
+        <!-- 所属店铺 -->
+        <el-form-item label="所属店铺">
+          <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>
-        <el-form-item label="规格" v-if="form.productType==2" prop="prescribeSpec">
+        <el-form-item label="规格" v-if="form.productType===2" prop="prescribeSpec">
           <el-input v-model="form.prescribeSpec" placeholder="请输入规格" />
         </el-form-item>
-        <el-form-item label="生产厂家" v-if="form.productType==2" prop="prescribeFactory">
+        <el-form-item label="生产厂家" v-if="form.productType===2" prop="prescribeFactory">
           <el-input v-model="form.prescribeFactory" placeholder="请输入生产厂家" />
         </el-form-item>
-        <el-form-item label="处方名" v-if="form.productType==2" prop="prescribeName">
+        <el-form-item label="处方名" v-if="form.productType===2" prop="prescribeName">
           <el-input v-model="form.prescribeName" placeholder="请输入处方名" />
         </el-form-item>
       </el-form>
@@ -945,7 +957,6 @@ 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;
@@ -1360,7 +1371,6 @@ export default {
         if(this.form.sliderImage!=null){
           this.photoArr=this.form.sliderImage.split(",");
         }
-        console.log(this.oneFormValidate)
         this.open = true;
         this.title = "审核商品";
       });
@@ -1420,7 +1430,6 @@ export default {
         param.reason = this.form1.reason;
         param.attachImage = this.form1.attachImage;
         param.isAudit=oper;
-        console.log("param",param)
         return batchAudit(param);
       }).then(res => {
         if(res.code === 200){