Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!228

src/views/business/goods/index.vue

@@ -200,6 +200,8 @@ export default {
         return
       }
       this.loading = true
+      console.log(this.queryParams.minCost)
+
       // if (reset) {
       //   this.queryParams = { pageNum: 1, pageSize: 20, orderByColumn: '', isAsc: '', }
       // }
@@ -210,10 +212,10 @@ export default {
         tagId: this.queryParams.tagId,
         status: this.queryParams.status,
         exchangeShow: this.queryParams.exchangeShow,
-        minCost: accMul(this.queryParams.minCost, 100),
-        maxCost: accMul(this.queryParams.maxCost, 100),
-        minValue: accMul(this.queryParams.minValue, 100),
-        maxValue: accMul(this.queryParams.maxValue, 100)
+        minCost: this.queryParams.minCost?accMul(this.queryParams.minCost, 100):this.queryParams.minCost,
+        maxCost: this.queryParams.maxCost?accMul(this.queryParams.maxCost, 100):this.queryParams.maxCost,
+        minValue: this.queryParams.minValue?accMul(this.queryParams.minValue, 100):this.queryParams.minValue,
+        maxValue: this.queryParams.maxValue?accMul(this.queryParams.maxValue, 100):this.queryParams.maxValue
       }).then(res => {
         this.loading = false
         if (res.code === 0) {

src/views/business/supplier/components/addSupplier.vue

@@ -24,7 +24,7 @@
             placeholder="请输入联系人"
           ></el-input>
         </el-form-item>
-        <el-form-item label="手机号码">
+        <el-form-item label="手机号码" prop="phone">
           <el-input
             v-model.number="form.phone"
             style="width: 240px"
@@ -79,6 +79,9 @@ export default {
         name: [
           { required: true, message: "请输入供应商名称", trigger: "blur" },
         ],
+        phone: [
+          { pattern: /^([1-9]\d*)$/, message: "请输入正确的数字", trigger: ["blur", "change"] }
+        ]
       },
     };
   },

src/views/business/ticket/components/GoodsAdd.vue

@@ -13,15 +13,15 @@
           placeholder="请输入商品名称"
           clearable
           size="small"
-          style="width: 220px"
-          @keyup.enter.native="getGoodsList()"
+          style="width: 220px" @clear="queryParams.pageNum = 1;getGoodsList()"
+          @keyup.enter.native="queryParams.pageNum = 1;getGoodsList()"
         />
         <div style="margin-left: 20px">商品价格：</div>
 <!--        <el-input v-model="minValue" placeholder="最低价格" clearable @keyup.enter.native="pageParams.pageNum = 1;getList()" />-->
-        <el-input style="width: 220px" v-model="queryParams.minValue" placeholder="最低价格" clearable @keyup.enter.native="getGoodsList()"/>
+        <el-input style="width: 220px" v-model="queryParams.minValue"  @clear="queryParams.pageNum = 1;getGoodsList()" placeholder="最低价格" clearable @keyup.enter.native="queryParams.pageNum = 1;getGoodsList()"/>
         <div style="width: 20px;text-align: center">-</div>
 <!--        <el-input v-model="maxValue" placeholder="最高价格" clearable @keyup.enter.native="pageParams.pageNum = 1;getList()" />-->
-        <el-input style="width: 220px" v-model="queryParams.maxValue" placeholder="最高价格" clearable @keyup.enter.native="getGoodsList()"/>
+        <el-input style="width: 220px" v-model="queryParams.maxValue"  @clear="queryParams.pageNum = 1;getGoodsList()" placeholder="最高价格" clearable @keyup.enter.native="queryParams.pageNum = 1;getGoodsList()"/>
 
         <div class="ge"></div>
         <el-button
@@ -124,7 +124,7 @@ export default {
           "&pageSize=" +
           this.pageParams.pageSize +
           "&",
-        { title: this.goodsTitle,  status: "on", minValue: accMul(this.queryParams.minValue, 100), maxValue: accMul(this.queryParams.maxValue, 100),}
+        { title: this.goodsTitle,  status: "on", minValue: this.queryParams.minValue?accMul(this.queryParams.minValue, 100):this.queryParams.minValue, maxValue: this.queryParams.maxValue?accMul(this.queryParams.maxValue, 100):this.queryParams.maxValue,}
       ).then((res) => {
         this.goodsList = res.rows.map((item) => {
           return {

src/views/order/exchange/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>