Merge remote-tracking branch 'origin/ecp' into ecp

# Conflicts:
#	src/views/claimSettlement/index.vue
#	src/views/system/personnelInformation.vue

src/router/views/index.js

@@ -446,7 +446,7 @@ export default [
         hidden: true,
         children: [{
             path: '/claimSettlement/index',
-            name: '理赔',
+            name: '理赔提报',
             meta: {
                 i18n: '/claimSettlement/index',
                 keepAlive: true,
@@ -530,7 +530,7 @@ export default [
         hidden: true,
         children: [{
             path: '/complain/index',
-            name: '投诉',
+            name: '投诉提报',
             meta: {
                 i18n: '/complain/index',
                 keepAlive: true,

src/views/claimSettlement/detailsPage.vue

@@ -125,10 +125,10 @@ export default {
                 label: "门店",
                 value: 2,
               },
-              // {
-              //   label: "终端消费者",
-              //   value: 3,
-              // },
+              {
+                label: "终端消费者",
+                value: 3,
+              },
             ],
             disabled: true,
           },

src/views/claimSettlement/index.vue

@@ -87,9 +87,9 @@ export default {
                 value: 1
               },
                 {
-                    label: "车主",
-                    value: 3
-                }
+                label: "车主",
+                value: 3,
+              }
             ],
             overHidden: true
           },

src/views/outboundWorkOrder/index.vue

@@ -208,37 +208,31 @@ export default {
           {
             label: "发货仓库名称",
             prop: "storageName",
-            width: 200,
             overHidden: true,
           },
           {
             label: "批次号",
             prop: "dot",
-            width: 100,
             overHidden: true,
           },
           {
             label: "采购订单号",
             prop: "poNo",
-            width: 100,
             overHidden: true,
           },
           {
             label: "库存",
             prop: "inventory",
-            width: 100,
             overHidden: true,
           },
           {
             label: "发货数量",
             prop: "sendNum",
-            width: 100,
             overHidden: true,
           },
           {
             label: "库区",
             prop: "reservoirArea",
-            width: 100,
             overHidden: true,
           },
         ],

src/views/saleOrder/detailsPage.vue

@@ -173,7 +173,7 @@
                 <el-button type="danger" plain size="small" @click="batchDelete" :disabled="editDis"
                   >一键删除</el-button
                 >
-                <el-button type="primary" plain size="small" @click="quickCopy">快捷复制</el-button>
+                <!-- <el-button type="primary" plain size="small" @click="quickCopy">快捷复制</el-button>
                 <el-popover width="600" trigger="click">
                   <avue-crud :data="inventoryData" :option="inventoryOption"></avue-crud>
                   <el-button
@@ -211,7 +211,7 @@
                     :disabled="selectionMultilist.length != 1 || isAddBtn"
                     >同步库存</el-button
                   >
-                </el-popover>
+                </el-popover> -->
               </template>
               <template slot="goodsId" slot-scope="{ row }">
                 {{ row.goodsName }}

src/views/store/detailsPage.vue

@@ -36,7 +36,7 @@
             class="el-button--small-yh"
             :type="form.enableOrNot == 0 ? 'primary' : ''"
             size="small"
-            v-if="form.id"
+            v-if="form.checkStatus=='审核通过'"
             @click="editEnable"
           >
             {{ form.enableOrNot == 0 ? "启用" : "禁用" }}
@@ -414,6 +414,7 @@ export default {
       corpTypeVisible: false,
       loadingBtn: false,
       form: {
+        enableOrNot:0,
         ifLimitAmount: "0",
       },
       form4: {},
@@ -956,7 +957,7 @@ export default {
           type: "success",
           message: data.enableOrNot ? "禁用成功!" : "启用成功!",
         });
-        this.getDetail(this.detailData.id);
+        this.getDetail(this.form.id);
         // this.$set(this.form, 'enableOrNot', data.enableOrNot == 1 ? 0 : 1)
       });
     },
@@ -964,7 +965,7 @@ export default {
       for (let item in this.data) {
         if (index != item) {
           if (this.data[item].defaultAddres == 1) {
-            this.$message.warning("开启默认地址");
+            this.$message.warning("已设置默认地址");
             return (row.defaultAddres = 0);
           }
         }
@@ -1129,6 +1130,10 @@ export default {
           }
           if (this.contactsData.length == 0) return this.$message.error("请添加客户联系人");
           if (this.data.length == 0) return this.$message.error("请添加地址信息");
+         
+          if(this.data.filter((item) => item.defaultAddres == 1).length == 0){
+             this.data[this.data.length - 1].defaultAddres = '1'
+          }
           for (let item of this.data) {
             if (!/^[1][3,4,5,7,8,9][0-9]{9}$/.test(item.tel)) {
               return this.$message.error("地址信息:请输入正确电话");

src/views/store/index.vue

@@ -40,7 +40,7 @@
             @search-criteria-switch="searchCriteriaSwitch"
           >
             <template slot="menuLeft">
-              <el-button type="primary" size="mini" icon="el-icon-plus" @click.stop="newAdd()">新建客户 </el-button>
+              <el-button type="primary" size="mini" icon="el-icon-plus" @click.stop="newAdd()">新建门店</el-button>
               <!-- <el-button type="primary" size="mini" icon="el-icon-bottom" @click="excelBox = true">导入 </el-button>
               <el-button type="primary" size="mini" icon="el-icon-top" @click="outExport">导出 </el-button>
               <el-button type="primary" size="mini" icon="el-icon-download" @click="brandBox = true">

src/views/system/user.vue

@@ -181,7 +181,7 @@ export default {
       platformBox: false,
       initFlag: true,
       // 需要重置的密码
-      newPassword: "123456",
+      newPassword: "Kbs@888",
       selectionList: [],
       query: {},
       loading: true,

src/views/wel/components/bulletin.vue

@@ -8,13 +8,15 @@
             >更多公告</el-button
           >
         </div>
-        <div v-for="item in data" :key="item.id" style="font-size: 14px">
-          <el-link style="cursor: pointer;font-weight: 600;font-size: 14px" @click="rowEdit(item)">
-            {{ item.title }}
-          </el-link>
-        </div>
-        <div v-if="data.length == 0" style="font-size: 14px; color: #c0c4cc">
-          <div>暂无公告</div>
+        <div style="margin: 18px">
+          <div v-for="item in data" :key="item.id" style="font-size: 14px">
+            <el-link style="cursor: pointer; font-weight: 600; font-size: 14px" @click="rowEdit(item)">
+              {{ item.title }}
+            </el-link>
+          </div>
+          <div v-if="data.length == 0" style="font-size: 14px; color: #c0c4cc">
+            <div>暂无公告</div>
+          </div>
         </div>
       </el-card>
     </div>