Merge branch 'dev-check-serve-20201103' into 'release'

Dev check serve 20201103 新建商品 增加检测服务类型

Dev check serve 20201103  新建商品 增加检测服务类型

See merge request !232

src/router/router.js

@@ -310,6 +310,9 @@ export default [{
         {
             path: '/create-good',
             component: createGood,
+            meta: {
+              keepAlive: false  //页面不需要缓存
+            },
         },
         {
             path: '/order-detail',

src/utils-o/fetch.js

@@ -56,7 +56,7 @@ service.interceptors.request.use(config => {
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = 'BFD804F3A3194FBBBE113962222839F6';
       // config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
-      config.headers['token'] = 'AAAA3AA4233E45CCBE5CABD476C9D6F8';
+      config.headers['token'] = '00AB2FF7626D4F5FB627399EDF23F5DC';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/utils/fetch.js

@@ -54,8 +54,8 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境qgit
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = 'C5172D7D7825463CA46752A894236AC2';
-      // config.headers['token'] = localStorage.getItem('storageToken')
+      // config.headers['token'] = '00AB2FF7626D4F5FB627399EDF23F5DC';
+      config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/utils/goods/index.js

@@ -13,6 +13,14 @@ export const getGoodsList = (params) => {
     description: '商品列表查询',
   })
 };
+export const getGoodDetails = (goodsId) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/goods/medical/service/detail/${goodsId}/-1`),
+    method: 'get',
+    description: '商品详情查询',
+  })
+}
 export const uploadExcel = data => {
   // return utils.checkAuth(()=>{
     return fetch({
@@ -43,6 +51,15 @@ export const updateGoods = (params) => {
     description: '创建/更新商品',
   })
 };
+export const updateGoodsV2 = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/goods/medical/service/upsert`),
+    method: 'post',
+    data: params,
+    description: '创建/更新商品',
+  })
+};
 ///dosage/all
 export const dosageAll = (parm) => {
   return fetch({
@@ -75,3 +92,14 @@ export const updateStock = (parm) => {
     description: '增加/减少库存',
   })
 };
+// http://dev-sc.yunqueyi.com/store/getHospitalInfoByStoreId?storeId=85
+// GET header:token
+
+export const getHospitalInfoByStoreId = (storeId) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/getHospitalInfoByStoreId?storeId=${storeId}`),
+    method: 'get',
+    description: '',
+  })
+};
\ No newline at end of file

src/views/goods/forms.js

+const form1 = {
+  categoryIdLevel2: '',
+  categoryIdLevel3: '',
+  categoryIdLevel4: '',
+  categoryIdLevel5: '',
+  medicCommonName:'',
+  medicGoodsName:'',
+  size:'',
+  dosageId:null,
+  usage:'',
+  otc1:'1',
+  approvalNumber:'',
+  manufacturer:'',
+  department:'',
+  expiredTime:'',
+  specification_url:'',
+  treatDisease:'',
+  barCode: '',
+}
+
+const form2 = {
+  checkPackageId: '', // 检测登记表，暂无，先隐藏！！！！！！！！！！！
+  checkName: '',
+  hospitalName: '',
+  hospitalType: '',
+  hospitalId: 0,
+  medicalServiceId: 0, // 新增时传0，更新时必需>0
+  goodsCheckImages: [],
+  checkItem: '',
+  checkStandard: '',
+  useCount: 1,
+  checkType: '',
+  suitable: '',
+  suitableArr: '',
+  accessorialService: '',
+  endTime: '',
+  barCode: '',
+  // medicalServiceId: ''
+}
+
+const form = {
+  // medicationId: 0,
+  // categoryId:'',
+  // otc:false,
+  // discountPrice:'',
+  // specificationImages:[],
+  // goodsId: 0, // 新增时传0，更新时必需>0
+  id: 0,
+  goodsName:'',
+  goodsDescription:'',
+  goodsHeaderImages:[],
+  goodsType:'',
+  barCode: '',
+  costPrice:0,
+  decrStock:0,//减少库存
+  incrStock:'',//增加库存
+  storeId: '',
+  optPrice:'',
+  goodsStock:0,
+  stock: 0,
+  externalGoodsCode: ''
+};
+
+
+export const originForm1 = form1;
+export const originForm2 = form2;
+export const originForm = form;
\ No newline at end of file

src/views/goods/goods-manage.vue

@@ -178,21 +178,24 @@
   import { getGoodsList,batchOnOff,uploadExcel} from '@/utils/goods';
   import { getBaseUrl } from '@/utils/index'
   var typeList = [{
-          categoryName: "短信额度",
-          id: 1,
-        }, {
-          categoryName: "学习卡",
-          id: 2,
-        },  {
-          categoryName: "职称考卡",
-          id: 3,
-        },{
-          categoryName: "医疗器械",
-          id: 4,
-        },{
-          categoryName: "药品",
-          id: 5,
-        }]
+    categoryName: "短信额度",
+    id: 1,
+  }, {
+    categoryName: "学习卡",
+    id: 2,
+  },  {
+    categoryName: "职称考卡",
+    id: 3,
+  },{
+    categoryName: "医疗器械",
+    id: 4,
+  },{
+    categoryName: "药品",
+    id: 5,
+  },{
+    categoryName: "检测服务",
+    id: 337,
+  }];
   export default {
     components: {
       BreadCrumb
@@ -413,13 +416,14 @@
         }
       },
       edit(row){
+        const { goodsType } = row;
         let url = ''
         if(row == 'add'){
           url = `/create-good?id=add&storeId=${this.searchForm.storeId}`
         }else{
-          url = `/create-good?id=${row.goodsId}&storeId=${this.searchForm.storeId}`
+          url = `/create-good?id=${row.goodsId}&storeId=${this.searchForm.storeId}&goodsType=${goodsType}`
         }
-        this.$store.dispatch('goodsManage/changeGoodsInfo', {...row});
+        // this.$store.dispatch('goodsManage/changeGoodsInfo', {...row});
         this.$router.push({
           path: url
         })

src/views/goods/order-manage.vue

@@ -213,7 +213,7 @@
       @close="showTuiDialog = false"
       width="385px"
     >
-      <el-form ref="tuiForm" :model="tuiForm" label-width="120px">
+      <el-form ref="tuiForm" :rules="rules" :model="tuiForm" label-width="120px">
         <el-form-item label="退款退货方式：">
           <el-select v-model="tuiForm.type" placeholder="请选择退货方式">
             <el-option
@@ -228,6 +228,15 @@
         <el-form-item label="退款金额" prop="name">
           <el-input v-model="tuiForm.money" :disabled="true"></el-input>
         </el-form-item>
+        <el-form-item label="退款对象" prop="userName">
+          <el-select v-model="userType" placeholder="请选择退款对象">
+            <el-option
+              v-for="item in userTypes"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" type="primary" @click="confirmTui">完成</el-button>
@@ -286,6 +295,9 @@
           orderNum: [
             { required: true, message: '请输入快递单号', trigger: "blur"},
           ],
+          userName: [
+            { required: true, message: '请选择退款对象', trigger: "blur"},
+          ],
         },
         showTuiDialog: false,
         tuiForm: {
@@ -309,10 +321,22 @@
             value: 2,
              disabled: true
           }
+        ],
+        userType: "",  // 1.开单医生, 2.支付用户
+        userTypes: [
+          {
+            label: '开单医生',
+            value: 1,
+          },
+          {
+            label: '支付用户',
+            value: 2,
+          },
         ]
       }
     },
     created() {
+      console.log("order created() : enter");
       this.searchForm.storeId = this.$route.query.storeId || 0,
       this.searchList();
     },
@@ -481,7 +505,11 @@
         this.showTuiDialog = true;
       },
       confirmTui() {
-        refundApply({ orderId: this.tuiForm.order.id }).then(res => {
+        if (this.userType == null || this.userType == "") {
+          this.$message.error("请选择退款对象");
+          return;
+        }
+        refundApply({ orderId: this.tuiForm.order.id, userType:  this.userType }).then(res => {
           if (res.code == '000000') {
             this.$message.success('操作成功');
             this.showTuiDialog = false;

src/views/goods/rules.js

+const checkBarcode = (rule, value, cb) => {
+  const valedBarcode = new RegExp("[\\u4E00-\\u9FFF]+","g"); 
+  if(value && valedBarcode.test(value)) cb(new Error('条形码不能输入中文'));
+  cb();
+};
+
+const checkNumber = (rule, value, cb) => {
+  const val = String(value);
+  const isInt = /^([1-9][0-9]*)$/;
+  if(val && !isInt.test(val)) cb(new Error('请输入正整数'));
+  cb();
+};
+
+const checkProjectStr = (rule, value, callback) => {
+  if (value.indexOf("\\") != -1) {
+    //存在
+    callback(new Error("请勿输入字符“ \\ ”"));
+  } else if (value.indexOf(".") != -1) {
+    callback(new Error("请勿输入字符“ . ”"));
+  } else {
+    callback();
+  }
+};
+
+const rules1 = {
+  barCode: [
+    { required: true, message: "请输入条形码", trigger: "submit" },
+    { validator: checkBarcode, trigger: "submit" }
+  ],
+  medicCommonName:[
+    { required: true, message: "请输入商品通用名称", trigger: "blur" }
+  ],
+  size:[
+    { required: true, message: "请输入商品规格", trigger: "blur" }
+  ],
+  manufacturer:[
+    { required: true, message: "请输入生产厂家", trigger: "blur" }
+  ],
+  approvalNumber:[
+    { required: true, message: "请输入批准文号", trigger: "blur" }
+  ],
+  dosageId:[
+    { required: true, message: "请选择剂型", trigger: "change" }
+  ],
+  categoryIdLevel2:[
+    { required: true, message: "请选择药品类型", trigger: "blur" }
+  ],
+  categoryIdLevel3:[
+    { required: true, message: "请选择一级类目", trigger: "blur" }
+  ],
+  categoryIdLevel4:[
+    { required: true, message: "请选择二级类目", trigger: "blur" }
+  ],
+  categoryIdLevel5:[
+    { required: true, message: "请选择三级类目", trigger: "blur" }
+  ],
+  specification_url:[
+    { required: true, message: "请上传药品说明书", trigger: "blur" }
+  ],
+  // otc:[
+  //   { required: true, message: "请选择是否是处方", trigger: "blur" }
+  // ],
+  dynamicFlag: [
+    { required: true, message: "请选择内容发布权", trigger: "blur" },
+  ],
+}
+
+const rules2 = {
+  barCode: [
+    { required: true, message: "请输入条形码", trigger: "submit" },
+    { validator: checkBarcode, trigger: "submit" }
+  ],
+  checkName: [{ required: true, message: "请输入检测名称", trigger: "blur" }],
+  hospitalName: [{ required: true, message: "请输入医疗机构名称", trigger: "blur" }],
+  hospitalType: [{ required: true, message: "请选择医疗机构类型", trigger: "blur" }],
+  checkItem: [{ required: true, message: "请输入检测项目", trigger: "blur" }],
+  checkStandard: [{ required: true, message: "请输入检测指标", trigger: "blur" }],
+  useCount: [{ required: true, message: "请输入使用人数", trigger: "submit" },{validator: checkNumber, trigger: "submit"}],
+  checkType: [{ required: true, message: "请选择检测类型", trigger: "blur" }],
+  suitableArr: [{ required: true, message: "请选择适用人群", trigger: "blur" }],
+  endTime: [{ required: true, message: "请选择商品使用日期", trigger: "blur" }],
+  // goodsCheckImages: [
+  //   { required: true, message: "请上传检测说明图", trigger: "blur" }
+  // ],
+}
+
+const rules = {
+  barCode: [
+    { required: true, message: "请输入条形码", trigger: "submit" },
+    { validator: checkBarcode, trigger: "submit" }
+  ],
+  goodsName: [
+    { required: true, message: "请输入商品名称", trigger: "submit" },
+    { validator: checkProjectStr, trigger: "submit" }
+  ],
+  goodsHeaderImages: [
+    { required: true, message: "请上传商品头图", trigger: "blur" }
+  ],
+  goodsType:[
+    { required: true, message: "请选择商品类型", trigger: "change" }
+  ],
+  optPrice: [
+    { required: true, message: "请输入零售价", trigger: "blur" },
+  ],
+  // introduce: [
+  //   { required: true, message: "请输入圈子介绍", trigger: "blur" },
+  //   {
+  //     min: 2,
+  //     max: 40,
+  //     message: "输入长度为2-40的内容，可包含中英文、数字及特殊符号",
+  //     trigger: "blur"
+  //   },
+  //   { validator: checkProjectStr, trigger: "blur" }
+  // ],
+}
+
+
+export const originRules1 = rules1;
+export const originRules2 = rules2;
+export const originRules = rules;
+
+ 
\ No newline at end of file