修改

scripts/page/indexPage.js

@@ -91,7 +91,7 @@ module.exports = function (compoenntName) {
         <el-table-column label="状态" show-overflow-tooltip align="center">
         <template slot-scope="scope">
           <el-tooltip
-            class="item"
+             
             effect="dark"
             :content="scope.row.status === '1' ? '改为禁用' : '改为启用'"
             placement="top"

src/apis/service/InvoiceSales/invoiceApply/index.js

@@ -29,7 +29,8 @@ export default {
 
   // 关联其他企业
   invoicelist: (data, params) => http(api + 'invoicelist', data, 'post', params),
-
+  // 公司发票信息列表
+  companylist: (data, params) => http(api + 'companylist', data, 'post', params),
   // 认领资金申请开票
   receiptbytrade: (data, params) => http(api + 'receiptbytrade', data, 'post', params),
   // 认领资金开票编辑

src/apis/service/parameter/finance/index.js

@@ -6,8 +6,8 @@ export default {
   add: (data, params) => http(api + 'companyadd', data, 'post', params),
   // 详情
   detail: (data, params) => http(api + 'companyinfo', data, 'post', params),
-// 修改状态
-status: (data, params) => http(api + 'companystatus', data, 'post', params),
+  // 修改状态
+  status: (data, params) => http(api + 'companystatus', data, 'post', params),
   // 列表
   list: (data, params) => http(api + 'companylist', data, 'post', params),
   // 更新

src/apis/service/search/table/index.js

@@ -4,5 +4,5 @@ import http from "@/apis/axios";
 const api = "Stats/";
 export default {
   // 退货统计
-  list: (data, params) => http(api + "qrdcptj", data, "post", params),
+  list: (data, params) => http(api + "departtj", data, "post", params),
 };

src/components/ExTable.vue

@@ -32,7 +32,7 @@
               />
               <el-tooltip
                 v-else
-                class="item"
+                 
                 :effect="column._screen_tip_effect_ || 'dark'"
                 :content="column._screen_tip_ || '筛选'"
                 :placement="column._screen_tip_placement_ || 'top'"

src/components/ExTableNew.vue

@@ -71,7 +71,7 @@
               />
               <el-tooltip
                 v-else
-                class="item"
+                 
                 :effect="column._screen_tip_effect_ || 'dark'"
                 :content="column._screen_tip_ || '筛选'"
                 :placement="column._screen_tip_placement_ || 'top'"

src/styles/index.scss

@@ -494,4 +494,12 @@ aside {
 }
 .el-table__fixed-left {
   height: 100% !important;
+}
+.el-table .warning-row {
+  background: #f5f7fa !important;
+  // background: oldlace !important;
+}
+
+.el-table .success-row {
+  background: #f0f9eb !important;
 }

src/views/InvoiceSales/capitalClaim/addEdit1.vue

@@ -79,15 +79,6 @@
                   <div class="fp-title">认领客户名称:</div>
                   <div class="fp-name">{{ resData.userinfo.companyName }}</div>
                 </el-col>
-
-                <!-- <el-col :span="11" :offset="1" class="clear">
-                  <div class="fp-title">联系人:</div>
-                  <div class="fp-name">{{ resData.userinfo.contactor }}</div>
-                </el-col>
-                <el-col :span="11" class="clear">
-                  <div class="fp-title">联系电话:</div>
-                  <div class="fp-name">{{ resData.userinfo.mobile }}</div>
-                </el-col> -->
               </el-row>
               <el-table
                 v-if="invList && invList.length > 0"
@@ -202,7 +193,7 @@
                   >>
                   <template slot-scope="scope">
                     <el-tooltip
-                      class="item"
+                       
                       effect="dark"
                       content="删除"
                       placement="top"
@@ -431,7 +422,7 @@
                 <el-table-column fixed="right" label="操作" width="50">
                   <template slot-scope="scope">
                     <el-tooltip
-                      class="item"
+                       
                       effect="dark"
                       content="删除"
                       placement="top"
@@ -526,7 +517,7 @@
                 <el-table-column fixed="right" label="操作" width="50">
                   <template slot-scope="scope">
                     <el-tooltip
-                      class="item"
+                       
                       effect="dark"
                       content="删除"
                       placement="top"

src/views/InvoiceSales/capitalClaim/index.vue

@@ -223,7 +223,7 @@
                   scope.row.status === '6' &&
                   parseInt(scope.row.balance) !== 0)
               "
-              class="item"
+               
               effect="dark"
               content="资金认领"
               placement="top"
@@ -248,7 +248,7 @@
                 scope.row.logNo !== scope.row.traNo &&
                 scope.row.status === '2'
               "
-              class="item"
+               
               effect="dark"
               content="认领审核"
               placement="top"
@@ -275,7 +275,7 @@
                   scope.row.logNo !== scope.row.traNo &&
                   scope.row.status === '4')
               "
-              class="item"
+               
               effect="dark"
               content="取消认领申请"
               placement="top"

src/views/InvoiceSales/clients/index.vue

@@ -72,7 +72,7 @@
       <template #operation="{ scope }">
         <el-tooltip
           v-if="powers.some((item) => item == '007')"
-          class="item"
+           
           effect="dark"
           content="详情"
           placement="top"
@@ -273,10 +273,6 @@ export default {
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
-        // this.tableData.map((v1) => {
-        //   v1.addtime = v1.addtime.replace(".000", "");
-        //   return v1;
-        // });
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();

src/views/InvoiceSales/invoiceApply/addEdit2.vue

@@ -39,8 +39,6 @@
               >
                 <el-form-item label="审核状态" prop="status">
                   <el-radio-group v-model="ruleForm.status">
-                    <!-- <el-radio :label="3">备选项</el-radio> -->
-                    <!-- <el-radio :label="6">备选项</el-radio> -->
                     <el-radio
                       v-for="item in options"
                       :key="item.value"
@@ -169,11 +167,11 @@ export default {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.loading = true;
-          const obj = JSON.parse(JSON.stringify(this.ruleForm));
+          const {status,remark} = JSON.parse(JSON.stringify(this.ruleForm));
           const model = {
             invNo: this.invNo,
-            status: obj.status,
-            remark: obj.remark,
+            status: status,
+            remark: remark,
           };
           const res = await asyncRequest.status(model);
           if (res&&res.code === 0) {

src/views/InvoiceSales/invoiceApply/addEdit3.vue

@@ -148,12 +148,14 @@ export default {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.loading = true;
-          const obj = JSON.parse(JSON.stringify(this.ruleForm));
+          const { status, remark, inv_info } = JSON.parse(
+            JSON.stringify(this.ruleForm)
+          );
           const model = {
             invNo: this.invNo,
-            status: obj.status,
-            remark: obj.remark,
-            inv_info: obj.inv_info,
+            status: status,
+            remark: remark,
+            inv_info: inv_info,
           };
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {

src/views/InvoiceSales/invoiceApply/addEdit4.vue

@@ -47,7 +47,7 @@ import resToken from "@/mixins/resToken";
 export default {
   name: "invoiceApply",
   props: ["showModel", "id", "isDetail", "status", "invNo"],
-  mixins:[resToken],
+  mixins: [resToken],
   components: {
     appProcess,
   },
@@ -147,14 +147,14 @@ export default {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.loading = true;
-          const obj = JSON.parse(JSON.stringify(this.ruleForm));
+          const { company, code } = JSON.parse(JSON.stringify(this.ruleForm));
           const model = {
             invNo: this.invNo,
-            company: obj.company,
-            code: obj.code,
+            company: company,
+            code: code,
           };
           const res = await asyncRequest.post(model);
-          if (res&&res.code === 0) {
+          if (res && res.code === 0) {
             this.$notify.success({
               title: "财务审核提交成功!",
               message: "",
@@ -163,8 +163,8 @@ export default {
             this.$emit("refresh");
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
-          }else  {
-           this.$message.warning(res.message);
+          } else {
+            this.$message.warning(res.message);
           }
         } else {
           console.log("error submit!!");

src/views/InvoiceSales/invoiceApply/addview copy.vue

@@ -344,7 +344,7 @@
             >
               <template slot-scope="scope">
                 <el-tooltip
-                  class="item"
+                   
                   effect="dark"
                   v-if="isDetail === '003' || isDetail === '005'"
                   content="编辑"
@@ -357,7 +357,7 @@
                   ></i>
                 </el-tooltip>
                 <el-tooltip
-                  class="item"
+                   
                   effect="dark"
                   content="删除"
                   v-if="isDetail === '003'"

src/views/InvoiceSales/invoiceApply/addview.vue

@@ -178,6 +178,28 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item
+              label="购买方开票信息"
+              label-width="125px"
+              prop="inv_out"
+            >
+              <el-select
+                v-model="ruleForm1.inv_out"
+                 :disabled="disableds"
+                placeholder="请选择购买方开票信息"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in invoiceList"
+                  :key="item.companyNo"
+                  :label="item.company_name"
+                  :value="item.companyNo"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
           <el-col :span="12" v-if="ruleForm1.type === '2'">
             <el-form-item label="开票总金额" prop="total">
@@ -353,7 +375,7 @@
             >
               <template slot-scope="scope">
                 <el-tooltip
-                  class="item"
+                   
                   effect="dark"
                   v-if="isDetail === '003' || isDetail === '005'"
                   content="编辑"
@@ -366,7 +388,7 @@
                   ></i>
                 </el-tooltip>
                 <el-tooltip
-                  class="item"
+                   
                   effect="dark"
                   content="删除"
                   v-if="isDetail === '003'"
@@ -596,7 +618,7 @@
             >
               <template>
                 <el-tooltip
-                  class="item"
+                   
                   effect="dark"
                   content="删除"
                   v-if="isDetail === '003'"
@@ -706,6 +728,7 @@ export default {
       showOrderModel: false,
       showCapitalModel: false,
       cwRes: null,
+      invoiceList: [],
       tableData: [],
       capitalTableData: [],
       activeIndex: 0,
@@ -769,6 +792,7 @@ export default {
         invoice_bank: "",
         invoice_bankNo: "",
         invoice_addr: "",
+        inv_out: "",
         invoice_mobile: "",
         type: "",
         total: 0,
@@ -780,6 +804,13 @@ export default {
         companyNo: [
           { required: true, message: "请选择申请企业", trigger: "change" },
         ],
+        inv_out: [
+          {
+            required: true,
+            message: "请选择购买方开票信息",
+            trigger: "change",
+          },
+        ],
         inv_add: [
           { required: true, message: "请选择发票抬头类型", trigger: "change" },
         ],
@@ -821,10 +852,7 @@ export default {
 
       dataForm: {
         name: "", // 业务员名字
-        // username: "", //账号
         status: "", //
-        // page: 1, // 页码
-        // size: 5, // 每页显示条数
       },
       activeOptions: [],
       groupallList: [],
@@ -866,32 +894,7 @@ export default {
         this.setform1();
       }
     },
-    text_fun(e, index, key) {
-      let p = e.target.parentElement;
-      // console.log(index, key);
-      this.tableData.map((v2) => {
-        v2.remark_type = "text";
-        v2.good_num_type = "text";
-        v2.total_fee_type = "text";
-        return v2;
-      });
-      this.tableData[index][key] = "input";
-      this.$nextTick((v) => {
-        if (p && p.firstElementChild && p.firstElementChild.firstElementChild) {
-          p.firstElementChild.firstElementChild.focus();
-        }
-      });
-    },
-    input_fun(index, key) {
-      // console.log(index, key);
-      this.tableData.map((v2) => {
-        v2.remark_type = "text";
-        v2.good_num_type = "text";
-        v2.total_fee_type = "text";
-        return v2;
-      });
-      this.tableData[index][key] = "text";
-    },
+
     orderRefresh(e) {
       let arr = JSON.parse(JSON.stringify(this.tableData));
       e.forEach((v1) => {
@@ -943,9 +946,9 @@ export default {
       this.exam_remark = "";
       this.loading = true;
       this.cwRes = null;
-      console.log(this.status);
       this.disableds = this.isDetail !== "003" && this.isDetail !== "005";
       this.tableData = [];
+      await this.getCompanylist();
       if (this.isDetail === "003") {
         this.title = "添加发票申请";
         this.rulesThis = this.rules1;
@@ -965,6 +968,21 @@ export default {
       }
       this.loading = false;
     },
+
+    async getCompanylist() {
+      this.invoiceList = [];
+      const res = await asyncRequest.companylist({
+        page: 1,
+        size: 30,
+      });
+      if (res && res.code === 0 && res.data && res.data.list) {
+        this.invoiceList = res.data.list;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.invoiceList = [];
+      }
+    },
     async selectChange() {
       let arr = JSON.parse(JSON.stringify(this.ruleForm1.companyNo));
 
@@ -1059,9 +1077,6 @@ export default {
           }
           this.validateFormField();
         }
-        console.log(this.cwRes);
-        console.log(this.ruleForm1);
-
         this.activeOptions2 = [data];
         this.ruleForm1.invoice_title = [data.id];
       } else if (res && res.code >= 100 && res.code <= 104) {
@@ -1088,7 +1103,6 @@ export default {
           }
           this.validateFormField();
         }
-        console.log(data);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
@@ -1121,9 +1135,7 @@ export default {
       this.selectLoading2 = true;
       if (query !== "") {
         this.activeOptions2 = [];
-        // this.formValue.company = query;
         const res = await asyncRequest.invoicelist({ name: query });
-        console.log(res);
         if (res && res.code === 0 && res.data) {
           this.activeOptions2 = res.data;
         } else if (res && res.code >= 100 && res.code <= 104) {
@@ -1137,9 +1149,7 @@ export default {
       this.selectLoading2 = false;
     },
     async initData() {
-      // this.loading = true;
       const res = await asyncRequest.detail({ id: this.id });
-      // this.loading = false;
       if (
         res &&
         res.code === 0 &&
@@ -1147,48 +1157,65 @@ export default {
         res.data.customer &&
         res.data.customer.companyNo
       ) {
-        const data = res.data;
-        const customer = res.data.customer;
+        const {
+          invoice_title,
+          invoice_code,
+          invoice_bank,
+          invoice_bankNo,
+          invoice_addr,
+          invoice_mobile,
+          inv_type,
+          type_check,
+          customer,
+          inv_value,
+          remark,
+          inv_add,
+          exam_remark,
+          order,
+          trade,
+          inv_out,
+        } = res.data;
+        const { companyNo } = customer;
+        // const data = res.data;
+        // const customer = res.data.customer;
 
         this.cwRes = {
           id: "0",
           companyNo: "0",
           companyName: "0",
-          invoice_title: data.invoice_title,
-          invoice_code: data.invoice_code,
-          invoice_bank: data.invoice_bank,
-          invoice_bankNo: data.invoice_bankNo,
-          invoice_addr: data.invoice_addr,
-          invoice_mobile: data.invoice_mobile,
+          invoice_title: invoice_title,
+          invoice_code: invoice_code,
+          invoice_bank: invoice_bank,
+          invoice_bankNo: invoice_bankNo,
+          invoice_addr: invoice_addr,
+          invoice_mobile: invoice_mobile,
         };
         this.ruleForm1 = {
-          companyNo: [customer.companyNo],
+          companyNo: [companyNo],
 
-          inv_type: data.inv_type ? parseInt(data.inv_type) + "" : "",
-          type: data.type_check ? parseInt(data.type_check) + "" : "",
-          total: data.inv_value,
-          remark: data.remark,
-          inv_add: data.inv_add,
-          invoice_title: [data.invoice_title],
-          invoice_code: data.invoice_code,
-          invoice_bank: data.invoice_bank,
-          invoice_bankNo: data.invoice_bankNo,
-          invoice_addr: data.invoice_addr,
-          invoice_mobile: data.invoice_mobile,
+          inv_type: inv_type ? parseInt(inv_type) + "" : "",
+          type: type_check ? parseInt(type_check) + "" : "",
+          total: inv_value,
+          remark: remark,
+          inv_add: inv_add,
+          inv_out: inv_out,
+          invoice_title: [invoice_title],
+          invoice_code: invoice_code,
+          invoice_bank: invoice_bank,
+          invoice_bankNo: invoice_bankNo,
+          invoice_addr: invoice_addr,
+          invoice_mobile: invoice_mobile,
         };
         this.activeOptions = [customer];
-        this.remark = data.remark;
-        this.exam_remark = data.exam_remark;
+        this.remark = remark;
+        this.exam_remark = exam_remark;
         console.log(this.ruleForm1);
         if (!this.disableds) {
           this.changetype(this.ruleForm1.type);
         }
-        console.log(res.data.order.good);
         let good =
-          res.data.order &&
-          res.data.order.good &&
-          res.data.order.good.length > 0
-            ? JSON.parse(JSON.stringify(res.data.order.good))
+          order && order.good && order.good.length > 0
+            ? JSON.parse(JSON.stringify(order.good))
             : [];
         good.map((v1) => {
           v1.sequenceNo = v1.goodNo;
@@ -1197,7 +1224,7 @@ export default {
           return v1;
         });
         this.tableData = good;
-        this.capitalTableData = data.trade;
+        this.capitalTableData = trade;
         this.capitalTableData.forEach((v1, i1) => {
           v1.customer = v1.companyName;
           this.$set(this.capitalTableData, i1, v1);
@@ -1210,7 +1237,6 @@ export default {
       console.log(this.ruleForm1);
     },
     changetype(val) {
-      console.log(val, "1234");
       if (this.rulesThis && this.rulesThis.total && this.rulesThis.remark) {
         if (val === 1) {
           this.rulesThis.total[0].required = false;
@@ -1259,7 +1285,7 @@ export default {
         }
       });
     },
-
+    //认领资金开票
     async submitForm2() {
       if (!this.loading) {
         // remark;
@@ -1268,27 +1294,16 @@ export default {
           this.$message.warning("请选择资金！");
           return;
         }
-
-        const obj = JSON.parse(JSON.stringify(this.ruleForm1));
         const list = [];
         this.capitalTableData.forEach((v1) => {
           list.push(v1.traNo);
         });
-        const model = {
-          invNo: this.invNo,
-          traNo: list,
-          inv_add: obj.inv_add,
-          companyNo: obj.companyNo.join(), //企业
-          inv_type: obj.inv_type + "", //发票类型
-          invoice_title:
-            obj.inv_add == "0" ? this.cwRes.invoice_title : obj.invoice_title,
-          invoice_code: obj.invoice_code,
-          invoice_bank: obj.invoice_bank,
-          invoice_bankNo: obj.invoice_bankNo,
-          invoice_addr: obj.invoice_addr,
-          invoice_mobile: obj.invoice_mobile,
-          remark: this.remark,
-        };
+        const model = await this.setInputForm(1);
+        model.traNo = list;
+        delete model["total"];
+        delete model["good"];
+
+        console.log(model);
         this.loading = true;
         let res = {};
         if (this.id === "add") {
@@ -1318,22 +1333,10 @@ export default {
     async mAddOrUpdate() {
       if (!this.loading) {
         this.loading = true;
-        const obj = JSON.parse(JSON.stringify(this.ruleForm1));
-        const model = {
-          invNo: this.invNo,
-          companyNo: obj.companyNo.join(), //企业
-          inv_type: obj.inv_type + "", //发票类型
-          total: obj.total + "", //金额
-          remark: obj.remark + "",
-          inv_add: obj.inv_add,
-          invoice_title:
-            obj.inv_add == "0" ? this.cwRes.invoice_title : obj.invoice_title,
-          invoice_code: obj.invoice_code,
-          invoice_bank: obj.invoice_bank,
-          invoice_bankNo: obj.invoice_bankNo,
-          invoice_addr: obj.invoice_addr,
-          invoice_mobile: obj.invoice_mobile,
-        };
+        const model = await this.setInputForm();
+        delete model["traNo"];
+        delete model["good"];
+        console.log(model);
         let res = {};
         if (this.id === "add") {
           delete model["invNo"];
@@ -1360,33 +1363,20 @@ export default {
       }
     },
 
+    //订单开票
     async submitForm() {
       if (!this.loading) {
-        // remark;
-
         if (this.tableData.length === 0) {
           this.$message.warning("请选择确认单商品");
           return;
         }
-        const obj = JSON.parse(JSON.stringify(this.ruleForm1));
         const list = JSON.parse(JSON.stringify(this.tableData));
         let isok = true;
-        let remark = true;
-        const model = {
-          invNo: this.invNo,
-          companyNo: obj.companyNo.join(), //企业
-          inv_type: obj.inv_type + "", //发票类型
-          inv_add: obj.inv_add,
-          invoice_title:
-            obj.inv_add == "0" ? this.cwRes.invoice_title : obj.invoice_title,
-          invoice_code: obj.invoice_code,
-          invoice_bank: obj.invoice_bank,
-          invoice_bankNo: obj.invoice_bankNo,
-          invoice_addr: obj.invoice_addr,
-          invoice_mobile: obj.invoice_mobile,
-          good: [],
-          remark: this.remark,
-        };
+        let isremark = true;
+        const model = await this.setInputForm(1);
+        delete model["traNo"];
+        delete model["total"];
+        console.log(model);
         list.forEach((v1) => {
           if (v1.good_num === 0) {
             isok = false;
@@ -1400,7 +1390,7 @@ export default {
           }
           let str = v1.remark.replace(/\s*/g, "");
           if (str === "") {
-            remark = false;
+            isremark = false;
           }
           let item = {
             sequenceNo: v1.sequenceNo,
@@ -1415,7 +1405,7 @@ export default {
           this.$message.error("商品数量/商品总额不能为0,商品单位不能为空！");
           return;
         }
-        if (!remark) {
+        if (!isremark) {
           this.$message.error("开票商品名不能为空！");
           return;
         }
@@ -1442,6 +1432,43 @@ export default {
         }
       }
     },
+    //解构接口入参字段重新组合
+    async setInputForm(type) {
+      const {
+        inv_add,
+        companyNo,
+        inv_type,
+        inv_out,
+        total,
+        remark,
+        invoice_title,
+        invoice_code,
+        invoice_bank,
+        invoice_bankNo,
+        invoice_addr,
+        invoice_mobile,
+      } = JSON.parse(JSON.stringify(this.ruleForm1));
+
+      const model = {
+        invNo: this.invNo,
+        traNo: [],
+        inv_add: inv_add,
+        companyNo: companyNo.join(), //企业
+        inv_type: inv_type + "", //发票类型
+        inv_out: inv_out,
+        total: total + "", //金额
+        remark: type ? this.remark : remark + "",
+        invoice_title:
+          inv_add == "0" ? this.cwRes.invoice_title : invoice_title,
+        invoice_code: invoice_code,
+        good: [],
+        invoice_bank: invoice_bank,
+        invoice_bankNo: invoice_bankNo,
+        invoice_addr: invoice_addr,
+        invoice_mobile: invoice_mobile,
+      };
+      return model;
+    },
   },
 };
 </script>

src/views/InvoiceSales/invoiceApply/appProcess.vue

@@ -34,7 +34,6 @@ export default {
   },
   methods: {
     async initForm() {
-      console.log(this.status);
       this.active = this.dstatusOptions.findIndex(
         (v) => v.id === parseInt(this.status)
       );

src/views/InvoiceSales/invoiceApply/goodChangeDialog.vue

@@ -207,17 +207,14 @@ export default {
     },
     async initForm() {
       this.loading = true;
-      console.log(this.item);
       await this.resetForm();
       this.rulesThis = this.rules;
-      console.log(this.item);
       this.ruleForm = Object.assign({}, this.item);
       this.loading = false;
     },
     async resetForm() {
       // 重置
       await this.$nextTick((sitem) => {
-        console.log(sitem);
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
@@ -262,8 +259,6 @@ export default {
           }
           this.showModelThis = false;
           this.$emit("refresh", this.ruleForm);
-          // console.log("this.icon");
-          // console.log(this.icon);
         } else {
           console.log("error submit!!");
           return false;

src/views/InvoiceSales/invoiceApply/index.vue

@@ -189,7 +189,6 @@
       <template #operation="{ scope }">
         <el-tooltip
           v-if="powers.some((item) => item == '007')"
-          class="item"
           effect="dark"
           content="详情"
           placement="top"
@@ -208,7 +207,6 @@
               scope.row.status === '0') ||
             (powers.some((item) => item == '005') && scope.row.status === '2')
           "
-          class="item"
           effect="dark"
           content="修改"
           placement="top"
@@ -226,7 +224,6 @@
               scope.row.status === '0') ||
             (powers.some((item) => item == '030') && scope.row.status === '2')
           "
-          class="item"
           effect="dark"
           content="发起审核流程"
           placement="top"
@@ -240,7 +237,6 @@
           v-if="
             powers.some((item) => item == '029') && scope.row.status === '1'
           "
-          class="item"
           effect="dark"
           content="财务审核"
           placement="top"
@@ -256,7 +252,6 @@
           v-if="
             powers.some((item) => item == '036') && scope.row.status === '3'
           "
-          class="item"
           effect="dark"
           content="财务开票"
           placement="top"
@@ -273,7 +268,6 @@
           v-if="
             powers.some((item) => item == '037') && scope.row.status === '4'
           "
-          class="item"
           effect="dark"
           content="填写物流"
           placement="top"
@@ -292,7 +286,6 @@
               scope.row.status === '0') ||
             (powers.some((item) => item == '027') && scope.row.status === '2')
           "
-          class="item"
           effect="dark"
           content="申请取消"
           placement="top"
@@ -469,16 +462,17 @@ export default {
           label: "客户企业名称",
           "min-width": "180px",
         },
+        {
+          prop: "kp_company",
+          label: "开票公司名称",
+          "min-width": "180px",
+        },
+
         {
           prop: "inv_value",
           label: "发票额度",
           width: "120px",
         },
-        // {
-        //   prop: "contactor",
-        //   label: "客户联系人",
-        //   width: "85px",
-        // },
         {
           prop: "type_check",
           label: "开票类型",

src/views/InvoiceSales/invoicePool/index.vue

@@ -332,6 +332,11 @@ export default {
           prop: "company",
           label: "公司名称",
           "min-width": "170px",
+        },
+         {
+          prop: "kp_company",
+          label: "开票公司名称",
+          "min-width": "180px",
         },
         {
           prop: "type_check",

src/views/InvoiceSales/orderBatchBilling/index.vue

@@ -306,6 +306,11 @@ export default {
           label: "客户企业名称",
           "min-width": "180px",
         },
+        {
+          prop: "kp_company",
+          label: "开票公司名称",
+          "min-width": "180px",
+        },
         {
           prop: "inv_value",
           label: "发票额度",

src/views/InvoiceSales/refund/index.vue

@@ -154,7 +154,7 @@
             powers.some((item) => item == '028') &&
             scope.row.refund_status === '1'
           "
-          class="item"
+           
           effect="dark"
           content="业务审核"
           placement="top"
@@ -171,7 +171,7 @@
             powers.some((item) => item == '029') &&
             scope.row.refund_status === '2'
           "
-          class="item"
+           
           effect="dark"
           content="财务审核"
           placement="top"
@@ -189,7 +189,7 @@
               scope.row.refund_status !== '3') &&
               (scope.row.refund_status !== '4')
           "
-          class="item"
+           
           effect="dark"
           content="取消申请"
           placement="top"

src/views/InvoiceSales/relation/addView.vue

@@ -89,7 +89,7 @@
                     <div class="myCard" v-if="item === 'order'">
                       <div class="title tc" style="padding: 0 0 5px 0">
                         <el-badge class="item lan fl" style="">确认单</el-badge>
-                        <el-badge class="item"
+                        <el-badge  
                           >当前核销：{{ order_total }} 元</el-badge
                         >
                         <el-button
@@ -370,7 +370,7 @@
                         >
                           <template slot-scope="scope">
                             <el-tooltip
-                              class="item"
+                               
                               effect="dark"
                               content="删除"
                               placement="top"
@@ -398,7 +398,7 @@
                     <div class="myCard" v-else-if="item === 'capital'">
                       <div class="title tc" style="padding: 0 0 5px 0">
                         <el-badge class="item lan fl">资金</el-badge>
-                        <el-badge class="item"
+                        <el-badge  
                           >当前核销：{{ trade_total }} 元</el-badge
                         >
                         <el-button
@@ -551,7 +551,7 @@
                         >
                           <template slot-scope="scope">
                             <el-tooltip
-                              class="item"
+                               
                               effect="dark"
                               content="删除"
                               placement="top"
@@ -580,7 +580,7 @@
                       <div class="title tc" style="padding: 0 0 5px 0">
                         <el-badge class="item lan fl">发票</el-badge>
 
-                        <el-badge class="item"
+                        <el-badge  
                           >当前核销：{{ inv_total }} 元</el-badge
                         >
                         <el-button
@@ -716,7 +716,7 @@
                           >>
                           <template slot-scope="scope">
                             <el-tooltip
-                              class="item"
+                               
                               effect="dark"
                               content="删除"
                               placement="top"

src/views/InvoiceSales/relation/index.vue

@@ -363,7 +363,7 @@
             (powers.some((item) => item == '007') &&
               scope.row.rela_form === '3')
           "
-          class="item"
+           
           effect="dark"
           content="详情"
           placement="top"
@@ -382,7 +382,7 @@
               scope.row.status !== '3' &&
               scope.row.rela_form === '3')
           "
-          class="item"
+           
           effect="dark"
           content="申请取消"
           placement="top"
@@ -401,7 +401,7 @@
               scope.row.status === '1' &&
               scope.row.rela_form === '3')
           "
-          class="item"
+           
           effect="dark"
           content="财务审核"
           placement="top"

src/views/InvoiceSales/relationQuery/index.vue

@@ -147,7 +147,7 @@
                   />
                   <el-tooltip
                     v-if="headIndex !== 1 && !item[head].btn"
-                    class="item"
+                     
                     effect="dark"
                     content="核销记录"
                     placement="top"

src/views/InvoiceSales/returnTicket/index.vue

@@ -194,7 +194,7 @@
             powers.some((item) => item == '028') &&
             scope.row.refund_status === '1'
           "
-          class="item"
+           
           effect="dark"
           content="业务审核"
           placement="top"
@@ -211,7 +211,7 @@
             powers.some((item) => item == '029') &&
             scope.row.refund_status === '2'
           "
-          class="item"
+           
           effect="dark"
           content="财务审核"
           placement="top"
@@ -228,7 +228,7 @@
             powers.some((item) => item == '048') &&
             scope.row.refund_status === '3'
           "
-          class="item"
+           
           effect="dark"
           content="财务核销发票"
           placement="top"
@@ -245,7 +245,7 @@
             powers.some((item) => item == '027') &&
             scope.row.refund_status !== '4'
           "
-          class="item"
+           
           effect="dark"
           content="取消申请"
           placement="top"

src/views/interest/account/addEdit.vue

@@ -279,13 +279,14 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
+          const { username, nickname, mobile, email, roleid, status } = sitem;
           this.ruleForm = {
-            username: sitem && sitem.username ? sitem.username : "", // 账号
-            name: sitem && sitem.nickname ? sitem.nickname : "", // 真实姓名
-            mobile: sitem && sitem.mobile ? sitem.mobile : "",
-            email: sitem && sitem.email ? sitem.email : "",
-            role_id: sitem && sitem.roleid ? sitem.roleid : "",
-            status: sitem && sitem.status ? sitem.status : "",
+            username: username || "", // 账号
+            name: nickname || "", // 真实姓名
+            mobile: mobile || "",
+            email: email || "",
+            role_id: roleid || "",
+            status: status || "",
           };
           if (this.id === "add" || this.isDetail) {
             this.rules.username[0].required = false;
@@ -297,15 +298,17 @@ export default {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.loading = true;
-          const obj = JSON.parse(JSON.stringify(this.ruleForm));
+          const { username, name, mobile, email, role_id, status } = JSON.parse(
+            JSON.stringify(this.ruleForm)
+          );
           const model = {
             id: this.id,
-            username: obj.username, // 账号
-            nickname: obj.name, // 真实姓名
-            mobile: obj.mobile,
-            email: obj.email,
-            role: obj.role_id,
-            status: obj.status,
+            username: username || "", // 账号
+            nickname: name || "", // 真实姓名
+            mobile: mobile || "",
+            email: email || "",
+            role: role_id || "",
+            status: status || "",
           };
           let res = {};
           if (this.id === "add") {

src/views/interest/account/index.vue

@@ -121,7 +121,7 @@
         <template #operation="{ scope }">
           <el-tooltip
             v-if="powers.some((item) => item == '020')"
-            class="item"
+             
             effect="dark"
             content="重置密码"
             placement="top"
@@ -134,7 +134,7 @@
 
           <el-tooltip
             v-if="powers.some((item) => item == '007')"
-            class="item"
+             
             effect="dark"
             content="详情"
             placement="top"
@@ -146,7 +146,7 @@
           </el-tooltip>
           <el-tooltip
             v-if="powers.some((item) => item == '005')"
-            class="item"
+             
             effect="dark"
             content="修改"
             placement="top"
@@ -160,7 +160,7 @@
             v-if="
               powers.some((item) => item == '004') && scope.row.status === '1'
             "
-            class="item"
+             
             effect="dark"
             content="禁用"
             placement="top"
@@ -174,7 +174,7 @@
             v-if="
               powers.some((item) => item == '004') && scope.row.status === '0'
             "
-            class="item"
+             
             effect="dark"
             content="启用"
             placement="top"

src/views/interest/dataShare/addEdit.vue

@@ -181,7 +181,7 @@ import resToken from "@/mixins/resToken";
 export default {
   name: "DataShare",
   props: ["showModel", "id", "isDetail"],
-  mixins:[resToken],
+  mixins: [resToken],
   data() {
     return {
       loading: false,
@@ -222,10 +222,7 @@ export default {
       },
       dataForm: {
         name: "", // 业务员名字
-        // username: "", //账号
         status: "", //
-        // page: 1, // 页码
-        // size: 5, // 每页显示条数
       },
       activeOptions: [],
       groupallList: [],
@@ -255,8 +252,6 @@ export default {
       await this.groupAllActive();
       if (this.id === "add") {
         this.title = "添加共享规则";
-        // this.ruleForm.isAdmin = 0;
-
         this.rulesThis = this.rules;
         await this.resetForm();
       } else {
@@ -273,18 +268,15 @@ export default {
       this.loading = false;
     },
     async initData() {
-      // this.loading = true;
       const res = await asyncRequest.detail({ id: this.id });
-      // this.loading = false;
       if (res && res.code === 0) {
-        const data = res.data;
-        this.ruleForm.collect = data.action_collect.split(",");
-        this.ruleForm.userid = data.share_user.split(",");
-        this.ruleForm.touserid =
-          data.to_user === "" ? [] : data.to_user.split(",");
-        this.ruleForm.togroupid =
-          data.to_group === "" ? [] : data.to_group.split(",");
-        this.ruleForm.action = data.action;
+        const { action_collect, share_user, to_user, to_group, action } =
+          res.data;
+        this.ruleForm.collect = action_collect.split(",");
+        this.ruleForm.userid = share_user.split(",");
+        this.ruleForm.touserid = to_user === "" ? [] : to_user.split(",");
+        this.ruleForm.togroupid = to_group === "" ? [] : to_group.split(",");
+        this.ruleForm.action = action;
         if (this.ruleForm.touserid.length !== 0) {
           this.select = "1";
         } else if (res && res.code >= 100 && res.code <= 104) {
@@ -294,7 +286,6 @@ export default {
           this.$message.warning(res.message);
         }
       }
-      console.log(this.ruleForm);
     },
     async initActionList() {
       const res = await asyncRequest.actionList({});
@@ -302,10 +293,9 @@ export default {
         const list = res.data;
         const arr = list.filter((item) => item.child && item.child.length > 0);
         this.actionList = arr;
-        // console.log(this.actionList);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
-      }else{
+      } else {
         this.$message.warning(res.message);
       }
     },
@@ -315,7 +305,7 @@ export default {
         this.activeOptions = res.data;
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
-      }else{
+      } else {
         this.$message.warning(res.message);
       }
     },
@@ -325,7 +315,7 @@ export default {
         this.groupallList = res.data;
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
-      }else{
+      } else {
         this.$message.warning(res.message);
       }
     },
@@ -365,14 +355,16 @@ export default {
             return;
           }
           this.loading = true;
-          const obj = JSON.parse(JSON.stringify(this.ruleForm));
+          const { collect, userid, touserid, togroupid, action } = JSON.parse(
+            JSON.stringify(this.ruleForm)
+          );
           const model = {
             id: this.id,
-            collect: obj.collect.join(),
-            userid: obj.userid.join(),
-            touserid: this.select === "1" ? obj.touserid.join() : "",
-            togroupid: this.select === "1" ? "" : obj.togroupid.join(),
-            action: obj.action,
+            collect: collect.join(),
+            userid: userid.join(),
+            touserid: this.select === "1" ? touserid.join() : "",
+            togroupid: this.select === "1" ? "" : togroupid.join(),
+            action: action,
           };
           let res = {};
           if (this.id === "add") {
@@ -393,7 +385,7 @@ export default {
             this.$emit("refresh");
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
-          }else{
+          } else {
             this.$message.warning(res.message);
           }
         } else {

src/views/interest/dataShare/index.vue

@@ -11,12 +11,12 @@
       @page-curr-change="handlePageChange"
       @page-size-change="handleSizeChange"
       @screen-reset="
-       pageInfo.curr = 1;
+        pageInfo.curr = 1;
         parmValue.page = 1;
         searchList();
       "
       @screen-submit="
-       pageInfo.curr = 1;
+        pageInfo.curr = 1;
         parmValue.page = 1;
         searchList();
       "
@@ -25,18 +25,25 @@
         <div style="width: 100%">
           <el-row :gutter="10">
             <el-col :span="24">
-              <el-col :span="3" style="width: 66px; float: right"  v-if="powers.some((item) => item == '002')">
+              <el-col
+                :span="3"
+                style="width: 66px; float: right"
+                v-if="powers.some((item) => item == '002')"
+              >
                 <el-button
-                 
                   type="primary"
                   :size="searchSize"
-                  style="float: right;"
+                  style="float: right"
                   @click="searchList"
                 >
                   刷新
                 </el-button>
               </el-col>
-              <el-col :span="3" style="width: 66px; float: right"  v-if="powers.some((item) => item == '003')">
+              <el-col
+                :span="3"
+                style="width: 66px; float: right"
+                v-if="powers.some((item) => item == '003')"
+              >
                 <el-button
                   :size="searchSize"
                   type="success"
@@ -51,7 +58,8 @@
         </div>
       </template>
       <template #status="{ scope }">
-        <el-tag :size="tablebtnSize" 
+        <el-tag
+          :size="tablebtnSize"
           :type="scope.row.status == '0' ? 'warning' : ''"
           v-text="
             (statusOptions.find((item) => item.id == scope.row.status) || {})
@@ -63,7 +71,6 @@
       <template #operation="{ scope }">
         <el-tooltip
           v-if="powers.some((item) => item == '007')"
-          class="item"
           effect="dark"
           content="详情"
           placement="top"
@@ -75,7 +82,6 @@
         </el-tooltip>
         <el-tooltip
           v-if="powers.some((item) => item == '005')"
-          class="item"
           effect="dark"
           content="修改"
           placement="top"
@@ -89,7 +95,6 @@
           v-if="
             powers.some((item) => item == '004') && scope.row.status === '1'
           "
-          class="item"
           effect="dark"
           content="禁用"
           placement="top"
@@ -103,7 +108,6 @@
           v-if="
             powers.some((item) => item == '004') && scope.row.status === '0'
           "
-          class="item"
           effect="dark"
           content="启用"
           placement="top"
@@ -137,7 +141,7 @@ import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
 export default {
   name: "role",
-  mixins: [mixinPage,resToken],
+  mixins: [mixinPage, resToken],
   components: {
     ExTable,
     addEdit,
@@ -166,9 +170,6 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        // loginName: "", // 账户
-        // fullName: "", // 姓名
-        // type: 2, // 用户类型（1运营人员 2物业人员）
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -188,7 +189,7 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ["setcol"]
+        _defaultHeader_: ["setcol"],
       },
       // 表格 - 分页
       pageInfo: {
@@ -248,9 +249,6 @@ export default {
         total: 0,
       };
       this.parmValue = {
-        // status: "", // 账户
-        // level: "", // 姓名
-        // role_name: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -305,14 +303,10 @@ export default {
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
-        // this.tableData.map((v1) => {
-        //   v1.addtime = v1.addtime.replace(".000", "");
-        //   return v1;
-        // });
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          }else {
+        await this.logout();
+      } else {
         this.tableData = [];
         this.pageInfo.total = 0;
       }

src/views/interest/group/addEdit.vue

@@ -92,7 +92,7 @@ import resToken from "@/mixins/resToken";
 export default {
   name: "Group",
   props: ["showModel", "id", "isDetail"],
-  mixins:[resToken],
+  mixins: [resToken],
   data() {
     return {
       loading: false,
@@ -143,10 +143,7 @@ export default {
 
       dataForm: {
         name: "", // 业务员名字
-        // username: "", //账号
         status: "", //
-        // page: 1, // 页码
-        // size: 5, // 每页显示条数
       },
       activeOptions: [],
     };
@@ -173,8 +170,6 @@ export default {
       this.loading = true;
       if (this.id === "add") {
         this.title = "添加用户组";
-        // this.ruleForm.isAdmin = 0;
-
         this.rulesThis = this.rules;
         await this.resetForm();
       } else {
@@ -192,19 +187,18 @@ export default {
     },
     async initData() {
       const res = await asyncRequest.detail({ id: this.id });
-      // console.log(res);
       if (res && res.code === 0) {
-        const data = res.data;
-        const arr = data.group_user.split(",");
+        const { group_name, group_user, group_remark } = res.data;
+        const arr = group_user.split(",");
         this.ruleForm = {
           id: this.id,
-          name: data.group_name,
+          name: group_name,
           group_user: arr,
-          group_remark: data.group_remark,
+          group_remark: group_remark,
         };
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
-      }else{
+      } else {
         this.$message.warning(res.message);
       }
     },
@@ -216,10 +210,9 @@ export default {
           this.$refs.ruleForm.clearValidate();
           this.ruleForm = {
             id: this.id,
-            name: "小组",
+            name: "",
             group_user: [],
-            group_remark: "小组备注",
-            // isAdmin: 0
+            group_remark: "",
           };
         }
       });
@@ -229,13 +222,11 @@ export default {
         if (valid) {
           this.loading = true;
           const obj = JSON.parse(JSON.stringify(this.ruleForm));
-          console.log(obj.group_user);
           const arr = obj.group_user.join();
-          console.log(arr);
           obj.group_user = arr;
           let res = {};
           if (this.id === "add") {
-            delete obj["idF"];
+            delete obj["id"];
             res = await asyncRequest.add(obj);
           } else {
             res = await asyncRequest.update(obj);
@@ -252,7 +243,7 @@ export default {
             this.$emit("refresh");
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
-          }else{
+          } else {
             this.$message.warning(res.message);
           }
         } else {
@@ -267,7 +258,7 @@ export default {
         this.activeOptions = res.data;
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
-      }else{
+      } else {
         this.$message.warning(res.message);
       }
     },

src/views/interest/group/index.vue

@@ -73,7 +73,7 @@
       <template #operation="{ scope }">
         <el-tooltip
           v-if="powers.some((item) => item == '007')"
-          class="item"
+           
           effect="dark"
           content="详情"
           placement="top"
@@ -85,7 +85,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="powers.some((item) => item == '005')"
-          class="item"
+           
           effect="dark"
           content="修改"
           placement="top"
@@ -99,7 +99,7 @@
           v-if="
             powers.some((item) => item == '004') && scope.row.status === '1'
           "
-          class="item"
+           
           effect="dark"
           content="禁用"
           placement="top"
@@ -113,7 +113,7 @@
           v-if="
             powers.some((item) => item == '004') && scope.row.status === '0'
           "
-          class="item"
+           
           effect="dark"
           content="启用"
           placement="top"
@@ -140,8 +140,6 @@
 import ExTable from "@/components/ExTableNew.vue";
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/interest/group";
-// import statusList from "@/assets/js/statusList";
-// import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
@@ -169,8 +167,6 @@ export default {
   },
   data() {
     return {
-      // statusList: statusList,
-      // roleLevel: roleLevel,
       loading: true,
       showModel: false,
       isDetail: false,
@@ -305,7 +301,6 @@ export default {
         this.tableData = res.data.list;
         this.tableData.map((e) => {
           e.userGroupList = e.userlist.join(",");
-          // e.addtime = e.addtime.replace(".000", "");
           return e;
         });
         this.pageInfo.total = Number(res.data.count);

src/views/interest/role/addEdit.vue

@@ -260,10 +260,8 @@ export default {
         if (value.lenght < 2 || value.lenght > 10) {
           callback(new Error("角色名称规则为2~10位汉字！"));
         } else if (!isChinese(value)) {
-          console.log(9999);
           callback(new Error("角色名称规则为2~10位汉字！"));
         } else if (isEmoticon(value)) {
-          console.log(2345);
           callback(new Error("角色名称规则为2~10位汉字！"));
         } else {
           callback();
@@ -345,15 +343,6 @@ export default {
         return selectItemLength > 0 && noSlectItemLength > 0;
       };
     },
-    // rules() {
-    //   let tran =
-    //     this.$store.state.common.ruleslist.find(
-    //       item => item.name == "function_power"
-    //     ) || {};
-    //   return this.$store.state.common.ruleslist.filter(
-    //     item => item.pid === tran.id
-    //   );
-    // },
   },
   watch: {
     showModel: function (val) {
@@ -401,7 +390,6 @@ export default {
     },
     // 复选框组内的选中/不选中
     handleCheckedGroupChange(event, index, item, subIndex) {
-      // console.log(event, index, subIndex);
       this.actionList[index].child[subIndex].checkAll = this.actionList[
         index
       ].child[subIndex].action.every(
@@ -443,7 +431,6 @@ export default {
         this.actionList[index].child[subIndex].checkAll = false;
       }
       this.$set(this.actionList, index, item);
-      // console.log(this.actionList[index].child[subIndex]);
     },
     // 单项复选框选中/不选中
     handleFieldChange(checked, id, index, subIndex, item) {
@@ -559,7 +546,6 @@ export default {
         });
 
         this.actionList = arr;
-        console.log(this.actionList);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       }else{
@@ -570,7 +556,6 @@ export default {
       const res = await asyncRequest.actionList({});
       if (res && res.code === 0) {
         const list = res.data;
-        console.log(list);
         let arr = list.filter((item) => item.child && item.child.length > 0);
         arr = arr.map((x) => {
           x.child.map((y) => {
@@ -599,7 +584,6 @@ export default {
         });
 
         this.actionList = arr;
-        console.log(this.actionList);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       }else{

src/views/interest/role/index.vue

@@ -145,7 +145,7 @@
       <template #operation="{ scope }">
         <el-tooltip
           v-if="powers.some((item) => item == '007')"
-          class="item"
+           
           effect="dark"
           content="详情"
           placement="top"
@@ -157,7 +157,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="powers.some((item) => item == '005')"
-          class="item"
+           
           effect="dark"
           content="修改"
           placement="top"
@@ -171,7 +171,7 @@
           v-if="
             powers.some((item) => item == '004') && scope.row.status === '1'
           "
-          class="item"
+           
           effect="dark"
           content="禁用"
           placement="top"
@@ -185,7 +185,7 @@
           v-if="
             powers.some((item) => item == '004') && scope.row.status === '0'
           "
-          class="item"
+           
           effect="dark"
           content="启用"
           placement="top"

src/views/parameter/finance/index.vue

@@ -60,7 +60,7 @@
       <template #operation="{ scope }">
         <el-tooltip
           v-if="powers.some((item) => item == '007')"
-          class="item"
+           
           effect="dark"
           content="详情"
           placement="top"
@@ -72,7 +72,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="powers.some((item) => item == '007')"
-          class="item"
+           
           effect="dark"
           content="修改"
           placement="top"
@@ -86,7 +86,7 @@
           v-if="
             powers.some((item) => item == '004') && scope.row.status === '1'
           "
-          class="item"
+           
           effect="dark"
           content="禁用"
           placement="top"
@@ -100,7 +100,7 @@
           v-if="
             powers.some((item) => item == '004') && scope.row.status === '0'
           "
-          class="item"
+           
           effect="dark"
           content="启用"
           placement="top"
@@ -154,6 +154,7 @@ export default {
       }
     },
   },
+  
   data() {
     return {
       isDetail: false,

src/views/purchase/porder/examEdit.vue

@@ -141,7 +141,7 @@
         <el-table-column label="操作" fixed="right" width="50">
           <template slot-scope="scope">
             <el-tooltip
-              class="item"
+               
               effect="dark"
               content="删除"
               placement="top"

src/views/purchase/porder/index.vue

@@ -508,6 +508,17 @@ import resToken from "@/mixins/resToken";
 import setEdit from "./setEdit";
 import { mapGetters } from "vuex";
 import examEdit from "./examEdit";
+import {
+  columns,
+  selectKlist,
+  options,
+  th_status_list,
+  send_status_list,
+  pay_status_list,
+  inv_status_list,
+  tHeader,
+  filterVal,
+} from "./tableVariable";
 export default {
   name: "porder",
   components: {
@@ -535,105 +546,24 @@ export default {
     return {
       selectK: "1",
       input: "",
-      selectKlist: [
-        {
-          code: "1",
-          name: "采购单编码",
-        },
-        {
-          code: "2",
-          name: "财务信息编号",
-        },
-        {
-          code: "3",
-          name: "业务员名字",
-        },
-        {
-          code: "4",
-          name: "商品编号",
-        },
-      ],
+      //输入框搜索类型
+      selectKlist: selectKlist,
       code: [],
       showModel1: false,
       showModel2: false,
       selectLoading: false,
       activeOptions: [],
       selection: [],
-      options: [
-        {
-          value: "0",
-          label: "未绑定",
-        },
-        {
-          value: "1",
-          label: "待审核",
-        },
-        {
-          value: "2",
-          label: "已通过",
-        },
-        {
-          value: "3",
-          label: "已驳回",
-        },
-      ],
-
-      th_status_list: [
-        {
-          value: "1",
-          label: "未退货",
-        },
-        {
-          value: "2",
-          label: "部分退货",
-        },
-        {
-          value: "3",
-          label: "全部退货",
-        },
-      ],
-      send_status_list: [
-        {
-          value: "1",
-          label: "未发货",
-        },
-        {
-          value: "2",
-          label: "部分发货",
-        },
-        {
-          value: "3",
-          label: "全部发货",
-        },
-      ],
-      pay_status_list: [
-        {
-          value: "1",
-          label: "未付款",
-        },
-        {
-          value: "2",
-          label: "部分付款",
-        },
-        {
-          value: "3",
-          label: "全部付款",
-        },
-      ],
-      inv_status_list: [
-        {
-          value: "1",
-          label: "未回票",
-        },
-        {
-          value: "2",
-          label: "部分回票",
-        },
-        {
-          value: "3",
-          label: "全部回票",
-        },
-      ],
+      //回票状态
+      options: options,
+      //退货状态
+      th_status_list: th_status_list,
+      //发货状态
+      send_status_list: send_status_list,
+      //付款状态
+      pay_status_list: pay_status_list,
+      //回票状态
+      inv_status_list: inv_status_list,
       // 状态
       statusOptions: [
         { id: "0", label: "禁用" },
@@ -684,111 +614,7 @@ export default {
         total: 0,
       },
       // 表格 - 列参数
-      columns: [
-        {
-          type: "expand",
-          label: "",
-          _slot_: "expand",
-        },
-        { type: "selection", fixed: "left", _noset_: true, width: "50" },
-        {
-          prop: "cgdNO",
-          label: "采购单编号",
-          width: "145",
-        },
-        {
-          prop: "goodNo",
-          label: "商品编号",
-          width: "125",
-        },
-        {
-          prop: "purchasePrice",
-          label: "货款",
-          width: "110px",
-        },
-
-        {
-          prop: "supplierNo",
-          label: "供货商编码",
-          width: "140px",
-        },
-        {
-          prop: "name",
-          label: "供货商",
-          width: "180px",
-        },
-
-        {
-          prop: "ownerName",
-          label: "采购员",
-        },
-        {
-          prop: "send_info",
-          label: "发货状态",
-          _slot_: "send_info",
-          width: "95px",
-        },
-        {
-          prop: "th_info",
-          label: "退货状态",
-          _slot_: "th_info",
-          width: "95px",
-        },
-        {
-          prop: "payinfo",
-          label: "付款状态",
-          _slot_: "payinfo",
-          width: "95px",
-        },
-        {
-          prop: "pay_fee",
-          label: "已付金额",
-          width: "110px",
-        },
-        {
-          prop: "wait_fee",
-          label: "待付金额",
-          width: "110px",
-        },
-        {
-          prop: "invinfo",
-          label: "回票状态",
-          _slot_: "invinfo",
-          width: "95px",
-        },
-        {
-          prop: "inv_open_fee",
-          label: "已回票金额",
-          width: "110px",
-        },
-        {
-          prop: "inv_wait_fee",
-          label: "待回票金额",
-          width: "110px",
-        },
-        {
-          prop: "inv_status",
-          label: "信息设置状态",
-          _slot_: "inv_status",
-          width: "100px",
-        },
-        {
-          prop: "inv_company",
-          label: "回票编号",
-          width: "170px",
-        },
-        {
-          prop: "inv_company_name",
-          label: "回票公司",
-          width: "180px",
-        },
-
-        {
-          prop: "DownTime",
-          label: "下单时间",
-          width: "140px",
-        },
-      ],
+      columns: columns,
     };
   },
   mounted() {
@@ -910,59 +736,29 @@ export default {
     },
     formatGoodList() {
       this.tableData.map((v1) => {
-        v1.purchasePrice = v1.purchasePrice
-          ? parseFloat(v1.purchasePrice + "").toFixed(2)
-          : "-";
-        v1.totalPrice = v1.totalPrice
-          ? parseFloat(v1.totalPrice + "").toFixed(2)
-          : "-";
-
-        v1.pay_fee = v1.pay_fee ? parseFloat(v1.pay_fee + "").toFixed(2) : "-";
-        v1.wait_fee = v1.wait_fee
-          ? parseFloat(v1.wait_fee + "").toFixed(2)
-          : "-";
-        v1.price = v1.price ? parseFloat(v1.price + "").toFixed(2) : "-";
-        v1.nakedPrice = v1.nakedPrice
-          ? parseFloat(v1.nakedPrice + "").toFixed(2)
-          : "-";
-        v1.markPrice = v1.markPrice
-          ? parseFloat(v1.markPrice + "").toFixed(2)
-          : "-";
-
-        v1.packPrice = v1.packPrice
-          ? parseFloat(v1.packPrice + "").toFixed(2)
-          : "-";
-        v1.certPrice = v1.certPrice
-          ? parseFloat(v1.certPrice + "").toFixed(2)
-          : "-";
-
-        v1.openPrice = v1.openPrice
-          ? parseFloat(v1.openPrice + "").toFixed(2)
-          : "-";
-        v1.craftPrice = v1.certPrice
-          ? parseFloat(v1.craftPrice + "").toFixed(2)
-          : "-";
-
-        v1.postPrice = v1.postPrice
-          ? parseFloat(v1.postPrice + "").toFixed(2)
-          : "-";
-        v1.weight = v1.weight ? parseFloat(v1.weight + "").toFixed(2) : "-";
-
-        v1.diff_fee = v1.diff_fee
-          ? parseFloat(v1.diff_fee + "").toFixed(2)
-          : "-";
-        v1.price = v1.price ? parseFloat(v1.price + "").toFixed(2) : "-";
-
-        v1.inv_open_fee = v1.inv_open_fee
-          ? parseFloat(v1.inv_open_fee + "").toFixed(2)
-          : "-";
-        v1.inv_wait_fee = v1.inv_wait_fee
-          ? parseFloat(v1.inv_wait_fee + "").toFixed(2)
-          : "-";
-
+        v1.purchasePrice = this.setNum(v1.purchasePrice);
+        v1.totalPrice = this.setNum(v1.totalPrice);
+        v1.pay_fee = this.setNum(v1.pay_fee);
+        v1.wait_fee = this.setNum(v1.wait_fee);
+        v1.price = this.setNum(v1.price);
+        v1.nakedPrice = this.setNum(v1.nakedPrice);
+        v1.markPrice = this.setNum(v1.markPrice);
+        v1.packPrice = this.setNum(v1.packPrice);
+        v1.certPrice = this.setNum(v1.certPrice);
+        v1.openPrice = this.setNum(v1.openPrice);
+        v1.craftPrice = this.setNum(v1.craftPrice);
+        v1.postPrice = this.setNum(v1.postPrice);
+        v1.weight = this.setNum(v1.weight);
+        v1.diff_fee = this.setNum(v1.diff_fee);
+        v1.price = this.setNum(v1.price);
+        v1.inv_open_fee = this.setNum(v1.inv_open_fee);
+        v1.inv_wait_fee = this.setNum(v1.inv_wait_fee);
         return v1;
       });
     },
+    setNum(s) {
+      return s ? parseFloat(s + "").toFixed(2) : "-";
+    },
     async remoteMethod(query) {
       this.selectLoading = true;
       if (query !== "") {
@@ -1009,94 +805,6 @@ export default {
         });
         const xlsName = `采购单导出`;
         import("@/vendor/Export2Excel").then((excel) => {
-          const tHeader = [
-            "采购单编号",
-            "货款",
-            "供应商编码",
-            "供应商名称",
-            "采购员",
-            "发货状态",
-            "退货状态",
-            "付款状态",
-            "已付金额",
-            "待付金额",
-            "回票状态",
-            "已回票金额",
-            "待回票金额",
-            "信息设置状态",
-            "回票编号",
-            "回票公司",
-            "下单时间",
-
-            "商品编号",
-            "商品名称",
-            "商品描述",
-            "单位",
-            "数量",
-            "含有工差",
-            "工期",
-            "成本合计",
-            "税率",
-            "成本裸价",
-            "加标费",
-            "包装费",
-            "证书费",
-            "开模费",
-            "物流费",
-            "工差",
-            "商品类型",
-            "商品品牌",
-            "商品型号",
-            "商品材质",
-            "商品颜色",
-            "金属种类",
-            "金属重量",
-            "金属价格",
-          ];
-          const filterVal = [
-            "cgdNO",
-            "purchasePrice",
-            "supplierNo",
-            "name",
-            "ownerName",
-            "send_info",
-            "th_info",
-            "payinfo",
-            "pay_fee",
-            "wait_fee",
-            "invinfo",
-            "inv_open_fee",
-            "inv_wait_fee",
-            "inv_status",
-            "inv_company",
-            "inv_company_name",
-            "DownTime",
-
-            "goodNo",
-            "goodName",
-            "goodDesc",
-            "goodUnit",
-            "orderNum",
-            "isDiff",
-            "workDay",
-            "pay_price",
-            "taxPoint",
-            "nakedPrice",
-            "markPrice",
-            "packPrice",
-            "certPrice",
-            "openPrice",
-            "postPrice",
-            "diff_fee",
-            "goodType",
-            "goodBank",
-            "goodModel",
-            "goodMaterial",
-            "goodColor",
-            "goodCat",
-            "weight",
-            "price",
-          ];
           const data = formatJson(filterVal, list);
           excel.export_json_to_excel({
             header: tHeader,

src/views/purchase/porder/setEdit.vue

@@ -157,7 +157,7 @@
         <el-table-column label="操作" fixed="right" width="50">
           <template slot-scope="scope">
             <el-tooltip
-              class="item"
+               
               effect="dark"
               content="删除"
               placement="top"

src/views/purchase/porder/tableVariable.js

@@ -0,0 +1,303 @@
+
+const columns = [
+    {
+        type: "expand",
+        label: "",
+        _slot_: "expand",
+    },
+    { type: "selection", fixed: "left", _noset_: true, width: "50" },
+    {
+        prop: "cgdNO",
+        label: "采购单编号",
+        width: "145",
+    },
+    {
+        prop: "goodNo",
+        label: "商品编号",
+        width: "125",
+    },
+    {
+        prop: "purchasePrice",
+        label: "货款",
+        width: "110px",
+    },
+
+    {
+        prop: "supplierNo",
+        label: "供货商编码",
+        width: "140px",
+    },
+    {
+        prop: "name",
+        label: "供货商",
+        width: "180px",
+    },
+
+    {
+        prop: "ownerName",
+        label: "采购员",
+    },
+    {
+        prop: "send_info",
+        label: "发货状态",
+        _slot_: "send_info",
+        width: "95px",
+    },
+    {
+        prop: "th_info",
+        label: "退货状态",
+        _slot_: "th_info",
+        width: "95px",
+    },
+    {
+        prop: "payinfo",
+        label: "付款状态",
+        _slot_: "payinfo",
+        width: "95px",
+    },
+    {
+        prop: "pay_fee",
+        label: "已付金额",
+        width: "110px",
+    },
+    {
+        prop: "wait_fee",
+        label: "待付金额",
+        width: "110px",
+    },
+    {
+        prop: "invinfo",
+        label: "回票状态",
+        _slot_: "invinfo",
+        width: "95px",
+    },
+    {
+        prop: "inv_open_fee",
+        label: "已回票金额",
+        width: "110px",
+    },
+    {
+        prop: "inv_wait_fee",
+        label: "待回票金额",
+        width: "110px",
+    },
+    {
+        prop: "inv_status",
+        label: "信息设置状态",
+        _slot_: "inv_status",
+        width: "100px",
+    },
+    {
+        prop: "inv_company",
+        label: "回票编号",
+        width: "170px",
+    },
+    {
+        prop: "inv_company_name",
+        label: "回票公司",
+        width: "180px",
+    },
+
+    {
+        prop: "DownTime",
+        label: "下单时间",
+        width: "140px",
+    },
+]
+//输入框搜索类型
+const selectKlist = [
+    {
+        code: "1",
+        name: "采购单编码",
+    },
+    {
+        code: "2",
+        name: "财务信息编号",
+    },
+    {
+        code: "3",
+        name: "业务员名字",
+    },
+    {
+        code: "4",
+        name: "商品编号",
+    },
+]
+//回票状态
+const options = [
+    {
+        value: "0",
+        label: "未绑定",
+    },
+    {
+        value: "1",
+        label: "待审核",
+    },
+    {
+        value: "2",
+        label: "已通过",
+    },
+    {
+        value: "3",
+        label: "已驳回",
+    },
+]
+//退货状态
+const th_status_list = [
+    {
+        value: "1",
+        label: "未退货",
+    },
+    {
+        value: "2",
+        label: "部分退货",
+    },
+    {
+        value: "3",
+        label: "全部退货",
+    },
+]
+//发货状态
+const send_status_list = [
+    {
+        value: "1",
+        label: "未发货",
+    },
+    {
+        value: "2",
+        label: "部分发货",
+    },
+    {
+        value: "3",
+        label: "全部发货",
+    },
+]
+//付款状态
+const pay_status_list = [
+    {
+        value: "1",
+        label: "未付款",
+    },
+    {
+        value: "2",
+        label: "部分付款",
+    },
+    {
+        value: "3",
+        label: "全部付款",
+    },
+]
+//回票状态
+const inv_status_list = [
+    {
+        value: "1",
+        label: "未回票",
+    },
+    {
+        value: "2",
+        label: "部分回票",
+    },
+    {
+        value: "3",
+        label: "全部回票",
+    },
+]
+//导出表头
+const tHeader = [
+    "采购单编号",
+    "货款",
+    "供应商编码",
+    "供应商名称",
+    "采购员",
+    "发货状态",
+    "退货状态",
+    "付款状态",
+    "已付金额",
+    "待付金额",
+    "回票状态",
+    "已回票金额",
+    "待回票金额",
+    "信息设置状态",
+    "回票编号",
+    "回票公司",
+    "下单时间",
+    "商品编号",
+    "商品名称",
+    "商品描述",
+    "单位",
+    "数量",
+    "含有工差",
+    "工期",
+    "成本合计",
+    "税率",
+    "成本裸价",
+    "加标费",
+    "包装费",
+    "证书费",
+    "开模费",
+    "物流费",
+    "工差",
+    "商品类型",
+    "商品品牌",
+    "商品型号",
+    "商品材质",
+    "商品颜色",
+    "金属种类",
+    "金属重量",
+    "金属价格",
+  ]
+  //导出字段
+  const filterVal = [
+    "cgdNO",
+    "purchasePrice",
+    "supplierNo",
+    "name",
+    "ownerName",
+    "send_info",
+    "th_info",
+    "payinfo",
+    "pay_fee",
+    "wait_fee",
+    "invinfo",
+    "inv_open_fee",
+    "inv_wait_fee",
+    "inv_status",
+    "inv_company",
+    "inv_company_name",
+    "DownTime",
+    "goodNo",
+    "goodName",
+    "goodDesc",
+    "goodUnit",
+    "orderNum",
+    "isDiff",
+    "workDay",
+    "pay_price",
+    "taxPoint",
+    "nakedPrice",
+    "markPrice",
+    "packPrice",
+    "certPrice",
+    "openPrice",
+    "postPrice",
+    "diff_fee",
+    "goodType",
+    "goodBank",
+    "goodModel",
+    "goodMaterial",
+    "goodColor",
+    "goodCat",
+    "weight",
+    "price",
+  ]
+export {
+    columns,
+    selectKlist,
+    options,
+    th_status_list,
+    send_status_list,
+    pay_status_list,
+    inv_status_list,
+    tHeader,
+    filterVal 
+};

src/views/purchase/supplierPay/index.vue

@@ -78,7 +78,7 @@
       <template #operation="{ scope }">
         <el-tooltip
           v-if="powers.some((item) => item == '007')"
-          class="item"
+           
           effect="dark"
           content="详情"
           placement="top"

src/views/report/index.vue

@@ -91,7 +91,7 @@
       </template>
       <template #operation="{ scope }">
         <el-tooltip
-          class="item"
+           
           effect="dark"
           :content="
             scope.row.status == 0
@@ -113,7 +113,7 @@
             "
           ></i>
         </el-tooltip>
-        <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+        <el-tooltip   effect="dark" content="编辑" placement="top">
           <i class="tb-icon el-icon-edit"></i>
         </el-tooltip>
       </template>

src/views/search/commission/index.vue

@@ -108,7 +108,7 @@
       <template #operation="{ scope }">
         <el-tooltip
           v-if="powers.some((item) => item == '007')"
-          class="item"
+           
           effect="dark"
           content="详情"
           placement="top"

src/views/search/table/index.vue

@@ -58,72 +58,68 @@
         </el-col>
       </div>
       <el-table
-        v-loading="loading"
         :data="tableData"
+        v-loading="loading"
         border
-        stripe
+        :max-height="maxHeight"
         :size="'mini'"
         style="width: 100%"
+        row-key="id"
+        default-expand-all
+        :row-class-name="tableRowClassName"
+        :tree-props="{ children: 'child', hasChildren: 'hasChildren' }"
       >
-        <el-table-column prop="p" label="业绩类型" fixed="left" min-width="81">
+        <el-table-column prop="p" label="业绩类型" fixed="left" width="120">
         </el-table-column>
-        <el-table-column label="本日金额" min-width="120" align="center">
-          <el-table-column show-overflow-tooltip label="销售" min-width="120">
+        <el-table-column label="本日金额" width="120" align="center">
+          <el-table-column show-overflow-tooltip label="销售" width="120">
             <template slot-scope="scope">
               <span>{{ scope.row.dtotal | toThousandFilter }}</span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip label="退款" min-width="120">
+          <el-table-column show-overflow-tooltip label="退款" width="120">
             <template slot-scope="scope">
               <span>{{ scope.row.thfee | toThousandFilter }}</span>
             </template>
           </el-table-column>
         </el-table-column>
 
-        <el-table-column label="本周金额" min-width="120" align="center">
-          <el-table-column show-overflow-tooltip label="销售" min-width="120">
+        <el-table-column label="本周金额" width="120" align="center">
+          <el-table-column show-overflow-tooltip label="销售" width="120">
             <template slot-scope="scope">
               <span>{{ scope.row.wtotal | toThousandFilter }}</span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip label="退款" min-width="120">
+          <el-table-column show-overflow-tooltip label="退款" width="120">
             <template slot-scope="scope">
               <span>{{ scope.row.wthfee | toThousandFilter }}</span>
             </template>
           </el-table-column>
         </el-table-column>
 
-        <el-table-column label="本月金额" min-width="120" align="center">
-          <el-table-column
-            show-overflow-tooltip
-            label="销售指标"
-            min-width="120"
-          >
+        <el-table-column label="本月金额" width="120" align="center">
+          <el-table-column show-overflow-tooltip label="销售指标" width="120">
             <template slot-scope="scope">
               <span>{{ scope.row.tips | toThousandFilter }}</span>
             </template>
           </el-table-column>
 
-          <el-table-column show-overflow-tooltip label="销售" min-width="120">
+          <el-table-column show-overflow-tooltip label="销售" width="120">
             <template slot-scope="scope">
               <span>{{ scope.row.total | toThousandFilter }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            label="销售完成率"
-            min-width="95"
-          >
+          <el-table-column show-overflow-tooltip label="销售完成率" width="95">
             <template slot-scope="scope">
-              <span>{{ scope.row.rate }}%</span>
+              <span>{{ scope.row.rate ? scope.row.rate + "%" : "" }}</span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip label="退款" min-width="120">
+          <el-table-column show-overflow-tooltip label="退款" width="120">
             <template slot-scope="scope">
               <span>{{ scope.row.mthfee | toThousandFilter }}</span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip label="净销售" min-width="120">
+          <el-table-column show-overflow-tooltip label="净销售" width="120">
             <template slot-scope="scope">
               <span>{{ scope.row.thtotal | toThousandFilter }}</span>
             </template>
@@ -131,10 +127,10 @@
           <el-table-column
             show-overflow-tooltip
             label="净销售完成率"
-            min-width="95"
+            width="95"
           >
             <template slot-scope="scope">
-              <span>{{ scope.row.thrate }}%</span>
+              <span>{{ scope.row.thrate ? scope.row.thrate + "%" : "" }}</span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -182,6 +178,13 @@ export default {
     this.restSearch();
   },
   methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if ((row && row.child && row.child.length > 0) || rowIndex === 0) {
+        return "warning-row";
+      } else {
+        return "";
+      }
+    },
     transformTime() {
       let time = new Date();
       let y = time.getFullYear();
@@ -202,6 +205,17 @@ export default {
       });
       if (res && res.code === 0 && res.data && res.data.length > 0) {
         this.tableData = res.data;
+        this.tableData.map((v1, i1) => {
+          v1.id = i1 + "";
+          v1.p = v1.p ? v1.p : v1.depart;
+          if (v1.child && v1.child.length > 0) {
+            v1.child.map((v2, i2) => {
+              v2.id = "" + v1 + i2;
+              return v2;
+            });
+          }
+          return v1;
+        });
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {