Merge branch 'dev' of 21.tcp.vip.cpolar.cn:hzy-starrysky/zkhx/gubersail/gubersail-platform-ui into dev

src/page/login/userlogin.vue

@@ -61,7 +61,6 @@
           size="small"
           style="margin-top: 10px"
           @click.native.prevent="handleLogin"
-          fill="#fff"
           class="login-submit">{{$t('login.submit')}}
       </el-button>
     </el-form-item>

src/router/views/index.js

@@ -509,5 +509,19 @@ export default [
             },
             component: () => import( /* webpackChunkName: "views" */ '@/views/store/index.vue')
         }]
+    },
+    {
+        path: '/complain/index',
+        component: Layout,
+        hidden: true,
+        children: [{
+            path: '/complain/index',
+            name: '投诉',
+            meta: {
+                i18n: '/complain/index',
+                keepAlive: true,
+            },
+            component: () => import( /* webpackChunkName: "views" */ '@/views/complain/index.vue')
+        }]
     }
 ];

src/styles/login.scss

@@ -73,7 +73,7 @@
   border-left: none;
   border-radius: 40px;
   color: #fff;
-  background-color: #ffffff00;
+  background-color: #ffffff14;
   width: 100%;
   float: left;
   box-sizing: border-box;

src/views/complain/detailsPage.vue

@@ -62,6 +62,7 @@
 </template>
 
 <script>
+// @ts-nocheck
 import { submit, detail, submitComplaint, revokeComplaint } from "@/api/complain/index";
 import dicSelect from "@/components/dicSelect/main.vue";
 import { getToken } from "@/util/auth";
@@ -240,13 +241,13 @@ export default {
             span: 12,
             minRows: 2
           },
-          {
-            label: "关闭原因",
-            prop: "closeReason",
-            type: "textarea",
-            span: 12,
-            minRows: 2
-          },
+          // {
+          //   label: "关闭原因",
+          //   prop: "closeReason",
+          //   type: "textarea",
+          //   span: 12,
+          //   minRows: 2
+          // },
           {
             label: "备注",
             prop: "remark",

src/views/complain/index.vue

@@ -21,10 +21,17 @@
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑 </el-button>
-          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)" :disabled="!(row.status == 0||row.status == 4)">删 除 </el-button>
+          <el-button
+            size="small"
+            icon="el-icon-delete"
+            type="text"
+            @click="rowDel(row, index)"
+            :disabled="!(row.status == 0 || row.status == 4)"
+            >删 除
+          </el-button>
         </template>
         <template slot="contractNo" slot-scope="{ row }">
-          <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">
+          <span style="color: #1e9fff; cursor: pointer" @click="rowEdit(row)">
             {{ row.contractNo }}
           </span>
         </template>
@@ -35,6 +42,7 @@
 </template>
 
 <script>
+// @ts-nocheck
 import { getList, remove } from "@/api/complain/index";
 import detailsPage from "./detailsPage.vue";
 import { getToken } from "@/util/auth";
@@ -48,7 +56,7 @@ export default {
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: 0,
       },
       selectionList: [],
       option: {
@@ -73,7 +81,7 @@ export default {
             label: "投诉单号",
             prop: "complaintNo",
             search: true,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "投诉人类型",
@@ -83,50 +91,50 @@ export default {
             dicData: [
               {
                 label: "终端消费者",
-                value: 1
+                value: 1,
               },
               {
                 label: "门店",
-                value: 2
+                value: 2,
               },
               {
                 label: "经销商",
-                value: 3
-              }
+                value: 3,
+              },
             ],
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "投诉人客户",
             prop: "customerName",
             width: 90,
             search: true,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "联系人姓名",
             prop: "contactName",
             width: 90,
             search: true,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "联系人电话",
             prop: "contactPhone",
             width: 90,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "投诉标题",
             prop: "title",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "问题描述",
             prop: "content",
-            overHidden: true
+            overHidden: true,
           },
-           {
+          {
             label: "投诉类型",
             prop: "complaintType",
             search: true,
@@ -134,7 +142,7 @@ export default {
             dicData: [
               {
                 label: "质量",
-                value: "质量"
+                value: "质量",
               },
               {
                 label: "物流",
@@ -142,19 +150,19 @@ export default {
               },
               {
                 label: "服务",
-                value: "服务"
+                value: "服务",
               },
               {
                 label: "其他",
-                value: "其他"
-              }
+                value: "其他",
+              },
             ],
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "可见范围位运算",
             prop: "visibleScope",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "投诉状态",
@@ -163,26 +171,26 @@ export default {
             dicData: [
               {
                 label: "待处理",
-                value: 0
+                value: 0,
               },
               {
                 label: "处理中",
-                value: 1
+                value: 1,
               },
               {
                 label: "已回复",
-                value: 2
+                value: 2,
               },
               {
                 label: "已关闭",
-                value: 3
+                value: 3,
               },
               {
                 label: "已撤销",
-                value: 4
-              }
+                value: 4,
+              },
             ],
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "回复状态",
@@ -191,35 +199,35 @@ export default {
             dicData: [
               {
                 label: "未回复",
-                value: 0
+                value: 0,
               },
               {
                 label: "已回复",
-                value: 1
-              }
+                value: 1,
+              },
             ],
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "关闭原因",
             prop: "closeReason",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "提交时间",
             prop: "submitTime",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "备注",
             prop: "remark",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "制单人",
             prop: "createUserName",
             overHidden: true,
-            width: 80
+            width: 80,
           },
           {
             label: "制单日期",
@@ -228,13 +236,13 @@ export default {
             overHidden: true,
             width: 100,
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
           },
           {
             label: "修改人",
             prop: "updateUserName",
             overHidden: true,
-            width: 80
+            width: 80,
           },
           {
             label: "修改日期",
@@ -243,15 +251,15 @@ export default {
             overHidden: true,
             width: 100,
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
-          }
-        ]
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+          },
+        ],
       },
-      data: []
+      data: [],
     };
   },
   components: {
-    detailsPage
+    detailsPage,
   },
   created() {},
   methods: {
@@ -263,7 +271,7 @@ export default {
      */
     rowEdit(row) {
       this.detailData = {
-        id: row.id
+        id: row.id,
       };
       this.isShow = false;
     },
@@ -279,9 +287,9 @@ export default {
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
-        remove({ ids: row.id }).then(res => {
+        remove({ ids: row.id }).then((res) => {
           this.onLoad(this.page, this.query);
           this.$message.success("成功删除");
         });
@@ -328,11 +336,11 @@ export default {
     onLoad(page, params = {}) {
       let obj = {};
       obj = {
-        ...Object.assign(params, this.query)
+        ...Object.assign(params, this.query),
       };
       this.loading = true;
       getList(page.currentPage, page.pageSize, obj)
-        .then(res => {
+        .then((res) => {
           this.data = res.data.data.records;
           this.page.total = res.data.data.total;
           this.$nextTick(() => {
@@ -350,14 +358,14 @@ export default {
       if (JSON.stringify(this.$route.query) != "{}") {
         this.$router.$avueRouter.closeTag();
         this.$router.push({
-          path: "/claimSettlement/index"
+          path: "/claimSettlement/index",
         });
       }
       this.detailData = {};
       this.isShow = true;
       this.onLoad(this.page, this.query);
-    }
-  }
+    },
+  },
 };
 </script>
 

src/views/salesLead/detailsPage.vue

@@ -73,6 +73,7 @@
 </template>
 
 <script>
+// @ts-nocheck
 import { submit, detail, submitLead, revokeLead, itemRemove } from "@/api/salesLead/index";
 import dicSelect from "@/components/dicSelect/main.vue";
 export default {
@@ -222,13 +223,13 @@ export default {
             ],
             disabled: true
           },
-          {
-            label: "关闭原因",
-            prop: "closeReason",
-            type: "textarea",
-            span: 12,
-            minRows: 2
-          },
+          // {
+          //   label: "关闭原因",
+          //   prop: "closeReason",
+          //   type: "textarea",
+          //   span: 12,
+          //   minRows: 2
+          // },
           {
             label: "备注",
             prop: "remark",

src/views/salesLead/index.vue

@@ -17,22 +17,10 @@
         @on-load="onLoad"
       >
         <template slot="menuLeft">
-          <el-button
-            type="primary"
-            size="small"
-            icon="el-icon-plus"
-            @click="addButton"
-            >创建单据
-          </el-button>
+          <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">创建单据 </el-button>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
-          <el-button
-            size="small"
-            icon="el-icon-edit"
-            type="text"
-            @click="rowEdit(row)"
-            >编辑
-          </el-button>
+          <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑 </el-button>
           <el-button
             size="small"
             icon="el-icon-delete"
@@ -43,24 +31,21 @@
           </el-button>
         </template>
         <template slot="contractNo" slot-scope="{ row }">
-          <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">
+          <span style="color: #1e9fff; cursor: pointer" @click="rowEdit(row)">
             {{ row.contractNo }}
           </span>
         </template>
       </avue-crud>
     </basic-container>
-    <detailsPage
-      v-if="!isShow"
-      :detailData="detailData"
-      @goBack="goBack"
-    ></detailsPage>
+    <detailsPage v-if="!isShow" :detailData="detailData" @goBack="goBack"></detailsPage>
   </div>
 </template>
 
 <script>
-import { getList, remove } from '@/api/salesLead/index';
-import detailsPage from './detailsPage.vue';
-import { getToken } from '@/util/auth';
+// @ts-nocheck
+import { getList, remove } from "@/api/salesLead/index";
+import detailsPage from "./detailsPage.vue";
+import { getToken } from "@/util/auth";
 export default {
   data() {
     return {
@@ -71,11 +56,11 @@ export default {
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: 0,
       },
       selectionList: [],
       option: {
-        height: 'auto',
+        height: "auto",
         calcHeight: 30,
         menuWidth: 120,
         tip: false,
@@ -89,61 +74,61 @@ export default {
         delBtn: false,
         selection: true,
         searchIcon: true,
-        align: 'center',
+        align: "center",
         searchIndex: 3,
         column: [
           {
-            label: '线索编号',
-            prop: 'leadCode',
+            label: "线索编号",
+            prop: "leadCode",
             search: true,
-            overHidden: true
+            overHidden: true,
           },
           {
-            label: '提报客户',
-            prop: 'customerName',
+            label: "提报客户",
+            prop: "customerName",
             width: 90,
             search: true,
-            overHidden: true
+            overHidden: true,
           },
           {
-            label: '联系人姓名',
-            prop: 'contactName',
+            label: "联系人姓名",
+            prop: "contactName",
             width: 90,
-            overHidden: true
+            overHidden: true,
           },
           {
-            label: '联系电话',
-            prop: 'contactPhone',
-            overHidden: true
+            label: "联系电话",
+            prop: "contactPhone",
+            overHidden: true,
           },
           {
-            label: '提报题目',
-            prop: 'title',
+            label: "提报题目",
+            prop: "title",
             search: true,
-            overHidden: true
+            overHidden: true,
           },
           {
-            label: '结束时间',
-            prop: 'endTime',
-            overHidden: true
+            label: "结束时间",
+            prop: "endTime",
+            overHidden: true,
           },
           {
-            label: '优先级',
-            prop: 'priority',
-            overHidden: true
+            label: "优先级",
+            prop: "priority",
+            overHidden: true,
           },
           {
-            label: '来源',
-            prop: 'source',
+            label: "来源",
+            prop: "source",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
-            label: '线索组名称',
-            prop: 'groupName',
+            label: "线索组名称",
+            prop: "groupName",
             search: true,
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           // {
           //   label: '索赔金额',
@@ -151,79 +136,78 @@ export default {
           //   overHidden: true
           // },
           {
-            label: '线索状态',
-            prop: 'status',
-            type: 'select',
+            label: "线索状态",
+            prop: "status",
+            type: "select",
             dicData: [
               {
-                label: '待处理',
-                value: 0
+                label: "待处理",
+                value: 0,
               },
               {
-                label: '跟进中',
-                value: 1
+                label: "跟进中",
+                value: 1,
               },
               {
-                label: '已转化',
-                value: 2
+                label: "已转化",
+                value: 2,
               },
               {
-                label: '已关闭',
-                value: 3
-              }
+                label: "已关闭",
+                value: 3,
+              },
             ],
-            overHidden: true
+            overHidden: true,
           },
           {
-            label: '关闭原因',
-            prop: 'closeReason',
-            overHidden: true
+            label: "关闭原因",
+            prop: "closeReason",
+            overHidden: true,
           },
           {
-            label: '备注',
-            prop: 'remark',
-            overHidden: true
+            label: "备注",
+            prop: "remark",
+            overHidden: true,
           },
           {
-            label: '制单人',
-            prop: 'createUserName',
+            label: "制单人",
+            prop: "createUserName",
             overHidden: true,
-            width: 80
+            width: 80,
           },
           {
-            label: '制单日期',
-            prop: 'createTime',
-            type: 'date',
+            label: "制单日期",
+            prop: "createTime",
+            type: "date",
             overHidden: true,
             width: 100,
-            format: 'yyyy-MM-dd',
-            valueFormat: 'yyyy-MM-dd HH:mm:ss'
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
           },
           {
-            label: '修改人',
-            prop: 'updateUserName',
+            label: "修改人",
+            prop: "updateUserName",
             overHidden: true,
-            width: 80
+            width: 80,
           },
           {
-            label: '修改日期',
-            prop: 'updateTime',
-            type: 'date',
+            label: "修改日期",
+            prop: "updateTime",
+            type: "date",
             overHidden: true,
             width: 100,
-            format: 'yyyy-MM-dd',
-            valueFormat: 'yyyy-MM-dd HH:mm:ss'
-          }
-        ]
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+          },
+        ],
       },
-      data: []
+      data: [],
     };
   },
   components: {
-    detailsPage
-  },
-  created() {
+    detailsPage,
   },
+  created() {},
   methods: {
     addButton() {
       this.isShow = false;
@@ -233,7 +217,7 @@ export default {
      */
     rowEdit(row) {
       this.detailData = {
-        id: row.id
+        id: row.id,
       };
       this.isShow = false;
     },
@@ -244,16 +228,16 @@ export default {
      */
     rowDel(row, index) {
       if (row.item == 1) {
-        return this.$message.error('存在明细不允许删除');
+        return this.$message.error("存在明细不允许删除");
       }
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       }).then(() => {
-        remove({ ids: row.id }).then(res => {
+        remove({ ids: row.id }).then((res) => {
           this.onLoad(this.page, this.query);
-          this.$message.success('成功删除');
+          this.$message.success("成功删除");
         });
       });
     },
@@ -298,11 +282,11 @@ export default {
     onLoad(page, params = {}) {
       let obj = {};
       obj = {
-        ...Object.assign(params, this.query)
+        ...Object.assign(params, this.query),
       };
       this.loading = true;
       getList(page.currentPage, page.pageSize, obj)
-        .then(res => {
+        .then((res) => {
           this.data = res.data.data.records;
           this.page.total = res.data.data.total;
           this.$nextTick(() => {
@@ -317,17 +301,17 @@ export default {
     // 详情的返回列表
     goBack() {
       // 初始化数据
-      if (JSON.stringify(this.$route.query) != '{}') {
+      if (JSON.stringify(this.$route.query) != "{}") {
         this.$router.$avueRouter.closeTag();
         this.$router.push({
-          path: '/boxManagement/buyContainer/index'
+          path: "/boxManagement/buyContainer/index",
         });
       }
       this.detailData = {};
       this.isShow = true;
       this.onLoad(this.page, this.query);
     },
-  }
+  },
 };
 </script>