Merge branch 'dev-20210712' into 'release'

Dev 20210712，code review:bo.dang

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!278

src/views/goods/forms.js

@@ -63,7 +63,9 @@ const form = {
   externalGoodsCode: '',
   leastCount:1,
   mostCount: -1,
-  incrType:1
+  incrType:1,
+  saleType:1,
+  minWhole:0
 };
 
 

src/views/goods/goods-manage.vue

@@ -65,6 +65,22 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="销售方式" v-if="commissionFlag == 2">
+              <el-select
+                v-model="searchForm.saleType"
+                placeholder="请选择销售方式"
+                size="small"
+                clearable>
+                <el-option
+                  v-for="item in saleTypeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="6" style="text-align: right">
             <el-button type="primary" size="small" @click="searchList">查询</el-button>
             <el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
@@ -138,9 +154,10 @@
             <span v-if="scope.row.proxyCommissionType == 2">{{scope.row.proxyCommissionPrice | priceNum}}元</span>
           </template>
         </el-table-column>
+        <el-table-column prop="saleTypeStr" label="销售方式" width="170" align="center">
+        </el-table-column>
         <el-table-column prop="saleTime" label="发布时间" width="170" align="center">
         </el-table-column>
-
         <el-table-column label="操作" width="200" align="center" fixed="right">
           <template slot-scope="scope">
             <div v-if="scope.row.commissionFlag == 2">
@@ -377,6 +394,7 @@
           pageSize:	10,
           storeId:0,
           commissionType: 0,
+          saleType:0,
           proxyCommissionType:0
         },
         innerVisible:false,
@@ -405,6 +423,19 @@
             value: 2,
             label: "固定分佣"
           }],
+        saleTypeList: [
+          {
+            value: 0,
+            label: "全部"
+          },
+          {
+            value: 1,
+            label: "零售"
+          },
+          {
+            value: 2,
+            label: "批发"
+          }],
         typeList: [],
         //uploadUrl:getBaseUrl('store/goods/import'),
         postData:{},
@@ -769,6 +800,7 @@
         this.searchForm.goodsName = ''
         this.searchForm.goodsType = ''
         this.searchForm.commissionType = 0;
+        this.searchForm.saleType = 0;
         this.searchForm.pageNo = 1
         this.searchForm.pageSize = 10
 
@@ -785,9 +817,9 @@
         this.getLists();
       },
       exportOpt() {
-        const { goodsIdList, goodsType, goodsName, storeId } = this.searchForm;
+        const { goodsIdList, goodsType, goodsName, storeId, saleType } = this.searchForm;
 
-        getGoodsExportUrl({ goodsIdList, goodsType, goodsName, storeId }).then(res => {
+        getGoodsExportUrl({ goodsIdList, goodsType, goodsName, storeId, saleType }).then(res => {
           if (res.code != '000000') {
             this.$message({ message: res.message, type: 'error' });
             return;

src/views/goods/order-detail.vue

@@ -71,6 +71,7 @@
               <p v-if="showStatus == 1 || showStatus == 2 || showStatus == 3">&nbsp;&nbsp;&nbsp;招募人：{{orderDetailData.ownerName}}</p>
               <p v-if="showStatus == 1 || showStatus == 2 || showStatus == 3">所属药代：{{orderDetailData.brokerName}}</p>
               <p>下单人手机号：{{orderDetailData.prescriberMobile}}</p>
+              <p>订单类型：{{orderDetailData.saleTypeStr}}</p>
               <!--<p>发货时间：{{orderDetailData.sendTime}}</p>-->
               <!--<p>成交时间：{{orderDetailData.finishTime}}</p>-->
             </div>
@@ -183,6 +184,7 @@
           brokerName:'',//药代名称
           prescriberMobile:'',//下单人手机号
           // showStatus: null,//订单展示状态,1已完成,2已发货,3待发货,4待支付,5交易关闭
+          saleTypeStr:'',// 订单类型
         },
         rulesExpress: {
           expressName: [

src/views/goods/order-manage.vue

@@ -5,7 +5,7 @@
       <div class="header-title">订单管理</div>
       <el-form ref="searchForm" :model="searchForm" label-width="80px" label-suffix=":" :inline="true">
         <el-row :gutter="30" type="flex" style="margin-top: 10px">
-          <el-col :span="18">
+          <el-col :span="24">
             <el-form-item label="商品名称">
               <el-input v-model="searchForm.goodsName" size="small" placeholder="请输入商品名称"></el-input>
             </el-form-item>
@@ -21,7 +21,7 @@
           </el-col>
         </el-row>
         <el-row :gutter="30" type="flex" style="margin-top: 10px">
-          <el-col :span="18">
+          <el-col :span="24">
             <el-form-item label="下单时间" class="t-b">
               <el-date-picker
                 v-model="createRangeTime"
@@ -41,7 +41,6 @@
                 placeholder="请输入招募人"
                 @change="changeOwner"
                 clearable
-                style="width:110%;height: 32px;line-height: 32px;"
               >
                 <el-option
                   v-for="item in brokerOwnerList"
@@ -57,7 +56,6 @@
                 id="statusSelector"
                 placeholder="请输入药代姓名"
                 clearable
-                style="width:110%;height: 32px;line-height: 32px;"
               >
                 <el-option
                   v-for="item in brokerList"
@@ -67,7 +65,37 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="订单类型">
+              <el-select
+                v-model="searchForm.saleType"
+                placeholder="请选择订单类型"
+                size="small"
+                clearable>
+                <el-option
+                  v-for="item in saleTypeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="订单类型">-->
+<!--              <el-select-->
+<!--                v-model="searchForm.saleType"-->
+<!--                placeholder="请选择订单类型"-->
+<!--                size="small"-->
+<!--                clearable>-->
+<!--                <el-option-->
+<!--                  v-for="item in saleTypeList"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="6" style="text-align: right">
             <el-button type="primary" size="small" @click="searchList">查询</el-button>
             <el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
@@ -118,6 +146,8 @@
             <p v-for="(item, index) in scope.row.priceList" :key="index" class="p-normal">￥{{item | toFixed2}}</p>
           </template>
         </el-table-column>
+        <el-table-column prop="saleTypeStr" label="销售方式" width="170" align="center">
+        </el-table-column>
         <el-table-column prop="createTime" label="下单时间" min-width="100" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime }}</span>
@@ -349,6 +379,7 @@
           ownerId:'',
           pageNo: 1,
           pageSize: 10,
+          saleType:0,
         },
         totalRows: 0,
         tableData: [],
@@ -425,6 +456,19 @@
             value: 2,
           },
         ],
+        saleTypeList: [
+          {
+            value: 0,
+            label: "全部"
+          },
+          {
+            value: 1,
+            label: "零售"
+          },
+          {
+            value: 2,
+            label: "批发"
+          }],
         ownerId:'',
         brokerList:[],
         brokerOwnerList:[],
@@ -476,6 +520,7 @@
           orderDate: '',
           brokerId:'',
           ownerId:'',
+          saleType:0,
           pageNo: 1,
           pageSize: 10,
         };
@@ -677,9 +722,9 @@
         });
       },
       exportOrder() {
-        const { goodsName, orderNo, receiver, orderDate, storeId, brokerId, ownerId, prescriberName, orderBeginTime, orderEndTime} = this.searchForm;
+        const { goodsName, orderNo, receiver, orderDate, storeId, brokerId, ownerId, prescriberName, orderBeginTime, orderEndTime, saleType} = this.searchForm;
 
-        getOrdersExportUrl({ goodsName, orderNo, receiver, orderDate, storeId,brokerId,ownerId,prescriberName, orderBeginTime, orderEndTime}).then(res => {
+        getOrdersExportUrl({ goodsName, orderNo, receiver, orderDate, storeId,brokerId,ownerId,prescriberName, orderBeginTime, orderEndTime, saleType}).then(res => {
           if (res.code != '000000') {
             this.$message({ message: res.message, type: 'error' });
             return;

src/views/goods/rules.js

 const checkBarcode = (rule, value, cb) => {
-  const valedBarcode = new RegExp("[\\u4E00-\\u9FFF]+","g"); 
+  const valedBarcode = new RegExp("[\\u4E00-\\u9FFF]+","g");
   if(value && valedBarcode.test(value)) cb(new Error('条形码不能输入中文'));
   cb();
 };
@@ -100,7 +100,16 @@ const rules = {
     { required: true, message: "请选择商品类型", trigger: "change" }
   ],
   optPrice: [
-    { required: true, message: "请输入零售价", trigger: "blur" },
+    { required: true, message: "请输入价格", trigger: "blur" },
+  ],
+  saleType:[
+    { required: true, message: "请选择销售方式", trigger: "change" }
+  ],
+  stock: [
+    { required: true, message: "请输入库存", trigger: "blur" },
+  ],
+  minWhole: [
+    { required: true, message: "请输入最小起批", trigger: "blur" },
   ],
   // introduce: [
   //   { required: true, message: "请输入圈子介绍", trigger: "blur" },
@@ -119,4 +128,3 @@ export const originRules1 = rules1;
 export const originRules2 = rules2;
 export const originRules = rules;
 
- 
\ No newline at end of file