Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/supply/components/addSupply.vue

@@ -32,11 +32,14 @@
                 @select="handleSelect"
               ></el-autocomplete> -->
 
-              <el-select v-model="supplier.supplierType" @select="handleSelect">
+              <el-select
+                v-model="supplier.supplierType"
+                @select="handleSelect"
+              >
                 <el-option
                   v-for="item in supplierType"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 >
                 </el-option>
@@ -287,7 +290,7 @@ export default {
       supplier: {
         supplierName: "",
         supplierCode: "gsy001",
-        supplierType: 0,
+        supplierType: "请选择类别",
         vatRate: 0,
         number: "",
         bank: "",
@@ -429,7 +432,7 @@ export default {
                     this.closePop();
                     this.$emit("init");
                   } else {
-                    this.$message.error("新增失败");
+                    this.$message.error("新增失败："+res.data.msg);
                     setTimeout(() => {
                       this.closePop();
                     }, 2000);
@@ -477,7 +480,7 @@ export default {
                     this.closePop();
                     this.$emit("init");
                   } else {
-                    this.$message.error("修改失败");
+                    this.$message.error("修改失败："+res.data.msg);
                     setTimeout(() => {
                       this.closePop();
                     }, 2000);

src/xt_pages/supply/supplyQuery.vue

@@ -180,7 +180,7 @@ export default {
       page: 1,
       limit: 10,
 
-      type_name: "请选择",
+      type_name: "请选择供应商类别",
       crumbs: [
         { path: false, name: "采购管理" },
         { path: "/supply/good/order/query", name: "供应商管理" },
@@ -230,6 +230,11 @@ export default {
     },
 
     toDelete(val, index) {
+      this.$confirm('确认删除吗？','删除',{
+        confirmButtonText: '确 定',
+        concelmButtonText: '取 消',
+        type: 'warning'
+      }).then(() => {
       delsupplys(val.ID)
         .then((res) => {
           if (res.data.code == 0) {
@@ -242,6 +247,7 @@ export default {
         .catch((err) => {
           console.log(err);
         });
+      }).catch(() => {})
     },
 
     toAdd(val) {