Merge branch 'dev' into 'test'

Dev

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

src/views/business/goods/components/spec.vue

@@ -150,7 +150,7 @@ export default {
       ],
       discountRateRules: [
         { required: true,message:'请输入回收折扣', trigger: 'blur' },
-        { pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的折扣，最多两位小数", trigger: ["blur", "change"] }
+        { pattern: /^([0-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的折扣，最多两位小数", trigger: ["blur", "change"] }
       ]
     }
   },

src/views/business/goods/index.vue

@@ -197,7 +197,7 @@
     <!--    查看卡密-->
     <camilo v-if="camiloShow" @cancel="cancel" :camiloShow="camiloShow" :camiloGoodsId="camiloGoodsId"></camilo>
     <!--    导入卡密-->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body :before-close="openSwitch">
       <a style="color: #1890FF;" @click="downloadExcel">下载Excel模版</a>
       <div style="padding-top: 20px; text-align: center">
         <el-upload
@@ -224,7 +224,7 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="upload.open = false">取 消</el-button>
+        <el-button @click="openSwitch()">取 消</el-button>
         <el-button type="primary" @click="submitFileForm">确 定</el-button>
       </div>
     </el-dialog>
@@ -351,6 +351,10 @@ export default {
         type: 'warning'
       })
     },
+    openSwitch() {
+      this.upload.open = false
+      this.$refs.upload.clearFiles();
+    },
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();

src/views/order/deliver/index.vue

@@ -269,7 +269,7 @@
       </el-table-column>
     </el-table>
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body :before-close="openSwitch">
       <el-upload
         ref="upload"
         :limit="1"
@@ -292,7 +292,7 @@
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="upload.open = false">取 消</el-button>
+        <el-button @click="openSwitch">取 消</el-button>
         <el-button type="primary" @click="submitFileForm">确 定</el-button>
       </div>
     </el-dialog>
@@ -532,6 +532,10 @@ export default {
         type: 'warning'
       })
     },
+    openSwitch(){
+      this.upload.open = false
+      this.$refs.upload.clearFiles();
+    },
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();