Browse Source

修改禅达bug

Qukatie 1 week ago
parent
commit
1c56b7c6d1

File diff suppressed because it is too large
+ 1 - 1
public/cdn/avue/2.8.18/avue.min.js


+ 5 - 5
src/views/imageShop/detailsPage.vue

@@ -41,7 +41,7 @@
           >提交申请
           >提交申请
         </el-button>
         </el-button>
         <el-button
         <el-button
-          v-if="form.id && form.auditStatus == 3"
+          v-if="form.id && (form.auditStatus == 1)"
           class="el-button--small-yh"
           class="el-button--small-yh"
           style="margin-left: 6px"
           style="margin-left: 6px"
           type="danger"
           type="danger"
@@ -70,7 +70,7 @@
           <tempalte slot="customerName">
           <tempalte slot="customerName">
             <dic-select
             <dic-select
               v-model="form.customerName"
               v-model="form.customerName"
-              placeholder="联系人"
+              placeholder="店铺名称"
               label="cname"
               label="cname"
               res="records"
               res="records"
               url="/gubersail-admin/corpsDesc/list?current=1&size=5"
               url="/gubersail-admin/corpsDesc/list?current=1&size=5"
@@ -125,7 +125,7 @@
           </template>
           </template>
           <template slot="menu" slot-scope="{ row, index }">
           <template slot="menu" slot-scope="{ row, index }">
             <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)" :disabled="editDis"
             <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)" :disabled="editDis"
-              >编辑
+              >{{row.$cellEdit?'保存':'编辑'}}
             </el-button>
             </el-button>
             <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)" :disabled="editDis"
             <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)" :disabled="editDis"
               >删除
               >删除
@@ -198,7 +198,7 @@ export default {
             disabled: false,
             disabled: false,
           },
           },
           {
           {
-            label: "联系人",
+            label: "店铺名称",
             prop: "customerName",
             prop: "customerName",
             disabled: false,
             disabled: false,
           },
           },
@@ -246,7 +246,7 @@ export default {
                 value: 1,
                 value: 1,
               },
               },
             ],
             ],
-            disabled: true,
+            disabled: false,
           },
           },
           {
           {
             label: "审核状态",
             label: "审核状态",

+ 5 - 0
src/views/imageShop/index.vue

@@ -188,6 +188,11 @@ export default {
             ],
             ],
             overHidden: true,
             overHidden: true,
           },
           },
+                  {
+            label: "拒绝原因",
+            prop: "auditRemark",
+            overHidden: true,
+          },
           {
           {
             label: "审核人",
             label: "审核人",
             prop: "auditorName",
             prop: "auditorName",

+ 6 - 0
src/views/outboundWorkOrder/index.vue

@@ -611,6 +611,12 @@ export default {
     console.log(this.$route.query);
     console.log(this.$route.query);
   },
   },
   activated() {
   activated() {
+    this.$nextTick(() => {
+      this.$refs.crud.doLayout();
+      this.$refs.crud.refreshTable();
+      this.$refs.crud2.doLayout();
+      this.$refs.crud2.refreshTable();
+    });
     if (this.$route.query.id) {
     if (this.$route.query.id) {
       this.detailData = {
       this.detailData = {
         id: this.$route.query.id,
         id: this.$route.query.id,

+ 2 - 1
src/views/store/detailsPage.vue

@@ -211,7 +211,7 @@
               @change="addressUnique(row, index)"
               @change="addressUnique(row, index)"
             >
             >
             </el-switch> </template
             </el-switch> </template
-          >detailedAddress
+          >
           <template slot="detailedAddress" slot-scope="{ row, index, disabled }">
           <template slot="detailedAddress" slot-scope="{ row, index, disabled }">
             <!-- <el-input
             <!-- <el-input
               v-model="row.detailedAddress"
               v-model="row.detailedAddress"
@@ -225,6 +225,7 @@
               placeholder="请选择地图"
               placeholder="请选择地图"
               v-model="row.map"
               v-model="row.map"
               @change="mapChage($event, row)"
               @change="mapChage($event, row)"
+              dialogWidth="60%"
             ></avue-input-map>
             ></avue-input-map>
             <span v-else>{{ row.detailedAddress }}</span>
             <span v-else>{{ row.detailedAddress }}</span>
           </template>
           </template>

Some files were not shown because too many files changed in this diff