Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/api/importTrade/salesContract.js

@@ -63,3 +63,11 @@ export function updateListRemove(data) {
     }
   })
 }
+//生成发货单
+export function generateShipment(data) {
+  return request({
+    url: '/api/blade-purchase-sales/entranceOrder/deliverGoods',
+    method: 'post',
+    data:data
+  })
+}

src/components/flow-dialog/main.vue

@@ -0,0 +1,65 @@
+<template>
+  <el-dialog
+    title="审批申请"
+    :visible.sync="visible"
+    width="60%"
+    :before-close="onClose"
+    append-to-body
+  >
+    <slot name='content'></slot>
+    <avue-form :option="option" v-model="query"></avue-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="onClose()">取 消</el-button>
+      <el-button @click="onClose()" type="primary">提交审核</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      query: {},
+      option: {
+        menuBtn:false,
+        column: [
+          {
+            label: "理由",
+            prop: "reason",
+            type:'textarea',
+            span:24,
+            rules: [
+              {
+                required: true,
+                message: "请输入理由",
+                trigger: "blur"
+              }
+            ]
+          }
+        ]
+      }
+    };
+  },
+  props: {
+    switchDialog: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    onClose() {
+      this.visible = false;
+      Object.assign(this.$data, this.$options.data());
+      this.$emit("onClose", false);
+    }
+  },
+  watch: {
+    switchDialog: function(i) {
+      this.visible = i;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

src/components/report-dialog/main.vue

@@ -0,0 +1,124 @@
+<template>
+  <el-dialog
+    title="提报列表"
+    :visible.sync="visible"
+    width="60%"
+    :before-close="onClose"
+    append-to-body
+  >
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      ref="crud"
+      :page.sync="page"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+    >
+      <template slot-scope="{ row }" slot="name">
+        <el-tag style="cursor:pointer" @click="goReport(row.name)">{{
+          row.name | nameFormat
+        }}</el-tag>
+      </template>
+    </avue-crud>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="onClose()">关 闭</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getList } from "@/api/report/report";
+import { nameReportFormat } from "@/filters/report";
+export default {
+  data() {
+    return {
+      visible: false,
+      loading: true,
+      query: {},
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      option: {
+        height: window.innerHeight - 500,
+        addBtn: false,
+        border: true,
+        index: true,
+        refreshBtn: false,
+        menu: false,
+        columnBtn: false,
+        header: false,
+        column: [
+          {
+            label: "文件名",
+            prop: "name",
+            overHidden: true
+          },
+          {
+            label: "创建时间",
+            prop: "createTime",
+            overHidden: true
+          },
+          {
+            label: "更新时间",
+            prop: "updateTime",
+            overHidden: true
+          }
+        ]
+      },
+      data: []
+    };
+  },
+  props: {
+    switchDialog: {
+      type: Boolean,
+      default: false
+    }
+  },
+  filters: {
+    nameFormat(name) {
+      return nameReportFormat(name);
+    }
+  },
+  methods: {
+    onClose() {
+      this.visible = false;
+      Object.assign(this.$data, this.$options.data());
+      this.$emit("onClose", false);
+    },
+    getList() {
+      this.loading = true;
+      getList(
+        this.page.currentPage,
+        this.page.pageSize,
+        Object.assign(this.query)
+      ).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+      });
+    },
+    goReport(name) {
+      this.$router.push({
+        path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}`
+      });
+    }
+  },
+  watch: {
+    switchDialog: function(i) {
+      this.visible = i;
+      this.query = {
+        name: this.$router.currentRoute.name
+      };
+      if (i) {
+        this.getList();
+      }
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

src/config/website.js

@@ -43,7 +43,7 @@ export default {
   // 第三方系统授权地址
   authUrl: 'http://localhost/blade-auth/oauth/render',
   // 流程设计器地址
-  flowDesignUrl: 'http://localhost:9999',
+  flowDesignUrl: 'http://192.168.1.177:9999',
   // 报表设计器地址(cloud端口为8108,boot端口为80)
-  reportUrl: 'http://localhost:8108/ureport',
+  reportUrl: 'http://192.168.1.177:8108/ureport',
 }

src/filters/report.js

@@ -0,0 +1,6 @@
+/**
+ * 文件名格式化
+ */
+export function nameReportFormat(name) {
+  return name.match(/-(\S*).ureport.xml/)[1];
+}

src/router/views/index.js

@@ -276,6 +276,7 @@ export default [{
     children: [
       {
         path: '/importInvoice_detailsPage',
+        name: '发货单',
         meta: {
           i18n: 'importInvoice_detailsPage'
         },

src/views/basicData/basicFeesDesc/configuration/mainList.json

@@ -42,6 +42,23 @@
       ]
     },
     {
+      "label": "费用类别",
+      "prop": "feesTypeId",
+      "dicData": [],
+      "type": "tree",
+      "hide": true,
+      "addDisabled": false,
+      "multiple": true,
+      "props": {
+        "label": "title"
+      },
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "click"
+      }]
+    },
+    {
       "label": "币别",
       "prop": "fcyno",
       "search": true,
@@ -90,22 +107,6 @@
       ]
     },
     {
-      "label": "费用类别",
-      "prop": "feesTypeId",
-      "dicData": [],
-      "type": "tree",
-      "hide": true,
-      "addDisabled": false,
-      "multiple": true,
-      "props": {
-        "label": "title"
-      },
-      "rules": [{
-        "required": true,
-        "message": " ",
-        "trigger": "click"
-      }]
-    },{
       "label": "备注",
       "prop": "remarks",
       "index": 6,

src/views/basicData/basicFeesDesc/index.vue

@@ -152,7 +152,13 @@ export default {
     },
     //新增子项和新增触发查询所有
     beforeOpen(done, type) {
-      console.log('1111')
+      if (["add"].includes(type)) {
+        this.option.column.forEach(e=>{
+          if(e.prop=='feesTypeId'){
+            this.$set(this.option.column,2,{...e,value:this.treeDeptId})
+          }
+        })
+      }
       if (["add", "edit"].includes(type)) {
         this.initData();
       }

src/views/basicData/commodityType/index.vue

@@ -534,6 +534,13 @@ export default {
     },
     //新增编辑查看触发
     async beforeOpen(done, type) {
+      if (["add"].includes(type)) {
+        this.option.column.forEach(e=>{
+          if(e.prop=='goodsTypeId'){
+            this.$set(this.option.column,2,{...e,value:this.treeDeptId})
+          }
+        })
+      }
       if (["edit", "view"].includes(type)) {
         await getUser(this.form.id).then(res => {
           this.form = res.data.data;

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -3,28 +3,63 @@
     <div class="customer-head">
       <div class="customer-back">
         <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
-        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
-                   @click="backToList">返回列表
+        <el-button
+          type="danger"
+          style="border: none;background: none;color: red"
+          icon="el-icon-arrow-left"
+          @click="backToList"
+          >返回列表
         </el-button>
       </div>
+
       <el-button
-          class="el-button--small-yh add-customer-btn"
-          type="primary"
-          :disabled="disabled"
-          @click="editCustomer"
-      >{{form.id?'确认修改':'确认新增'}}
+        class="add-customer-btn"
+        type="primary"
+        :disabled="disabled"
+        @click="editCustomer"
+        >{{ form.id ? "确认修改" : "确认新增" }}
+      </el-button>
+      <el-button class="flow-btn" type="primary" @click="openFlow"
+        >审 核
       </el-button>
     </div>
     <div style="margin-top: 60px">
-      <el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
+      <el-form
+        :model="form"
+        ref="form"
+        label-width="100px"
+        class="demo-ruleForm"
+      >
         <containerTitle title="基础资料"></containerTitle>
         <basic-container style="margin-bottom: 10px">
           <el-row>
-            <el-col v-for="(item,index) in basicData.column" :key="index" :span="item.span?item.span:8">
-              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                <avue-input-tree v-if="item.prop === 'corpsTypeId'"  leaf-only multiple :props="{label:'title'}" v-model="form[item.prop]" placeholder="请选择内容" type="tree" :dic="dic"
+            <el-col
+              v-for="(item, index) in basicData.column"
+              :key="index"
+              :span="item.span ? item.span : 8"
+            >
+              <el-form-item
+                :label="item.label"
+                :prop="item.prop"
+                :rules="item.rules"
+              >
+                <avue-input-tree
+                  v-if="item.prop === 'corpsTypeId'"
+                  leaf-only
+                  multiple
+                  :props="{ label: 'title' }"
+                  v-model="form[item.prop]"
+                  placeholder="请选择内容"
+                  type="tree"
+                  :dic="dic"
                 ></avue-input-tree>
-                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
+                <el-input
+                  type="age"
+                  v-else
+                  v-model="form[item.prop]"
+                  size="small"
+                  autocomplete="off"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -32,9 +67,22 @@
         <containerTitle title="联系方式"></containerTitle>
         <basic-container style="margin-bottom: 10px">
           <el-row>
-            <el-col v-for="(item,index) in contactInformation.column" :key="index" :span="item.span?item.span:8">
-              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                <el-input type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
+            <el-col
+              v-for="(item, index) in contactInformation.column"
+              :key="index"
+              :span="item.span ? item.span : 8"
+            >
+              <el-form-item
+                :label="item.label"
+                :prop="item.prop"
+                :rules="item.rules"
+              >
+                <el-input
+                  type="age"
+                  v-model="form[item.prop]"
+                  size="small"
+                  autocomplete="off"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -42,17 +90,32 @@
         <containerTitle title="财务资料"></containerTitle>
         <basic-container style="margin-bottom: 10px">
           <el-row>
-            <el-col v-for="(item,index) in financialInformation.column" :key="index" :span="item.span?item.span:8">
-              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+            <el-col
+              v-for="(item, index) in financialInformation.column"
+              :key="index"
+              :span="item.span ? item.span : 8"
+            >
+              <el-form-item
+                :label="item.label"
+                :prop="item.prop"
+                :rules="item.rules"
+              >
                 <el-switch
-                    v-if="item.prop === 'creditstatus'"
-                    v-model="form[item.prop]"
-                    active-value="0"
-                    inactive-value="1"
-                    active-text="开启"
-                    inactive-text="关闭">
+                  v-if="item.prop === 'creditstatus'"
+                  v-model="form[item.prop]"
+                  active-value="0"
+                  inactive-value="1"
+                  active-text="开启"
+                  inactive-text="关闭"
+                >
                 </el-switch>
-                <el-input v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
+                <el-input
+                  v-else
+                  type="age"
+                  v-model="form[item.prop]"
+                  size="small"
+                  autocomplete="off"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -60,127 +123,145 @@
         <containerTitle title="客户联系人"></containerTitle>
         <basic-container style="margin-bottom: 10px">
           <avue-crud
-              :option="customerContact"
-              v-model="contactsForm"
-              :data="contactsData"
-              @row-save="rowSave"
-              @row-update="rowUpdate"
-              @row-del="rowDel"
+            :option="customerContact"
+            v-model="contactsForm"
+            :data="contactsData"
+            @row-save="rowSave"
+            @row-update="rowUpdate"
+            @row-del="rowDel"
           ></avue-crud>
         </basic-container>
         <containerTitle title="客户优势项目"></containerTitle>
         <basic-container style="margin-bottom: 10px">
           <avue-crud
-              :option="advantageProject"
-              v-model="advantageProjectForm"
-              :data="advantageProjectData"
-              @row-save="rowSaveProject"
-              @row-update="rowUpdateProject"
-              @row-del="rowDelProject"
+            :option="advantageProject"
+            v-model="advantageProjectForm"
+            :data="advantageProjectData"
+            @row-save="rowSaveProject"
+            @row-update="rowUpdateProject"
+            @row-del="rowDelProject"
           ></avue-crud>
         </basic-container>
         <containerTitle title="客户开户行"></containerTitle>
         <basic-container style="margin-bottom: 40px">
           <avue-crud
-              :option="bankOfDeposit"
-              v-model="bankOfDepositForm"
-              :data="bankOfDepositData"
-              @row-save="rowSaveBankOfDeposit"
-              @row-update="rowUpdateBankOfDeposit"
-              @row-del="rowDelBankOfDeposit"
+            :option="bankOfDeposit"
+            v-model="bankOfDepositForm"
+            :data="bankOfDepositData"
+            @row-save="rowSaveBankOfDeposit"
+            @row-update="rowUpdateBankOfDeposit"
+            @row-del="rowDelBankOfDeposit"
           ></avue-crud>
         </basic-container>
       </el-form>
     </div>
+    <flow-dialog
+      :switchDialog="switchDialog"
+      @onClose="onClose()"
+    >
+    <template slot="content">111</template>
+    </flow-dialog>
   </div>
 </template>
 
 <script>
-import {customerList, typeSave, detail, deleteDetails,
+import {
+  customerList,
+  typeSave,
+  detail,
+  deleteDetails,
   corpstypeTree,
   corpsattn,
   corpsbank,
   corpsfiles,
-  corpsitem} from "@/api/basicData/customerInformation"
-import customerContact from "./configuration/customerContact.json"
-import advantageProject from "./configuration/advantageProject.json"
-import bankOfDeposit from "./configuration/bankOfDeposit.json"
+  corpsitem
+} from "@/api/basicData/customerInformation";
+import customerContact from "./configuration/customerContact.json";
+import advantageProject from "./configuration/advantageProject.json";
+import bankOfDeposit from "./configuration/bankOfDeposit.json";
+import flowDialog from "@/components/flow-dialog/main";
 export default {
   name: "detailsPage",
   data() {
     return {
+      switchDialog:false,
       form: {},
-      disabled:false,
+      disabled: false,
       contactsForm: {},
       advantageProjectForm: {},
       bankOfDepositForm: {},
       contactsData: [],
       advantageProjectData: [],
       bankOfDepositData: [],
-      dic:[],
-      customerContact:customerContact,
-      advantageProject:advantageProject,
-      bankOfDeposit:bankOfDeposit,
+      dic: [],
+      customerContact: customerContact,
+      advantageProject: advantageProject,
+      bankOfDeposit: bankOfDeposit,
       contactInformation: {
         column: [
           {
-            label: '联系人',
-            prop: 'attn',
+            label: "联系人",
+            prop: "attn",
             rules: [
               {
                 required: false,
-                message: '请输入联系人',
-                trigger: 'blur'
+                message: "请输入联系人",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '联系电话',
-            prop: 'tel',
+          },
+          {
+            label: "联系电话",
+            prop: "tel",
             rules: [
               {
                 required: false,
-                message: '请输入联系电话',
-                trigger: 'blur'
+                message: "请输入联系电话",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '职位',
-            prop: 'positoin',
+          },
+          {
+            label: "职位",
+            prop: "positoin",
             rules: [
               {
                 required: false,
-                message: '请输入联系电话',
-                trigger: 'blur'
+                message: "请输入联系电话",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '单位地址',
-            prop: 'addr',
+          },
+          {
+            label: "单位地址",
+            prop: "addr",
             rules: [
               {
                 required: false,
-                message: '请输入单位地址',
-                trigger: 'blur'
+                message: "请输入单位地址",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '仓库地址',
-            prop: 'storageAddr',
+          },
+          {
+            label: "仓库地址",
+            prop: "storageAddr",
             rules: [
               {
                 required: false,
-                message: '请输入仓库地址',
-                trigger: 'blur'
+                message: "请输入仓库地址",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '分仓地址',
-            prop: 'subStorageAddr',
+          },
+          {
+            label: "分仓地址",
+            prop: "subStorageAddr",
             rules: [
               {
                 required: false,
-                message: '请输入分仓地址',
-                trigger: 'blur'
+                message: "请输入分仓地址",
+                trigger: "blur"
               }
             ]
           }
@@ -189,113 +270,123 @@ export default {
       financialInformation: {
         column: [
           {
-            label: '账户名称',
-            prop: 'accountName',
+            label: "账户名称",
+            prop: "accountName",
             rules: [
               {
                 required: false,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '开户银行',
-            prop: 'accountBank',
+          },
+          {
+            label: "开户银行",
+            prop: "accountBank",
             rules: [
               {
                 required: false,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '银行帐号',
-            prop: 'accountNo',
+          },
+          {
+            label: "银行帐号",
+            prop: "accountNo",
             rules: [
               {
                 required: false,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '外币账户名称',
-            prop: 'accountNameFcy',
+          },
+          {
+            label: "外币账户名称",
+            prop: "accountNameFcy",
             rules: [
               {
                 required: false,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '外币开户银行',
-            prop: 'accountBankFcy',
+          },
+          {
+            label: "外币开户银行",
+            prop: "accountBankFcy",
             rules: [
               {
                 required: false,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '外币银行账号',
-            prop: 'accountNoFcy',
+          },
+          {
+            label: "外币银行账号",
+            prop: "accountNoFcy",
             rules: [
               {
                 required: false,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '授信状态',
-            prop: 'creditstatus',
+          },
+          {
+            label: "授信状态",
+            prop: "creditstatus",
             rules: [
               {
                 required: false,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '授信等级',
-            prop: 'creditLevel',
+          },
+          {
+            label: "授信等级",
+            prop: "creditLevel",
             rules: [
               {
                 required: false,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '授信额度',
-            prop: 'creditGrant',
+          },
+          {
+            label: "授信额度",
+            prop: "creditGrant",
             rules: [
               {
                 required: false,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '授信天数',
-            prop: 'creditDay',
+          },
+          {
+            label: "授信天数",
+            prop: "creditDay",
             rules: [
               {
                 required: false,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '授信利率',
-            prop: 'creditRate',
+          },
+          {
+            label: "授信利率",
+            prop: "creditRate",
             rules: [
               {
                 required: false,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
           }
@@ -304,116 +395,128 @@ export default {
       basicData: {
         column: [
           {
-            label: '客户编码',
-            prop: 'code',
+            label: "客户编码",
+            prop: "code",
             rules: [
               {
                 required: true,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '代理品牌',
-            prop: 'goodtypes',
+          },
+          {
+            label: "代理品牌",
+            prop: "goodtypes",
             rules: [
               {
                 required: true,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '所属公司',
-            prop: 'belongtocompany',
+          },
+          {
+            label: "所属公司",
+            prop: "belongtocompany",
             rules: [
               {
                 required: true,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '客户名称',
-            prop: 'cname',
+          },
+          {
+            label: "客户名称",
+            prop: "cname",
             rules: [
               {
                 required: true,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '客户类别',
-            prop: 'corpsTypeId',
+          },
+          {
+            label: "客户类别",
+            prop: "corpsTypeId",
             rules: [
               {
                 required: true,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
-            label: '企业类型',
-            prop: 'companytype',
+          },
+          {
+            label: "企业类型",
+            prop: "companytype",
             rules: [
               {
                 required: true,
-                message: ' ',
-                trigger: 'blur'
+                message: " ",
+                trigger: "blur"
               }
             ]
-          }, {
+          },
+          {
             label: "代理区域",
             span: 24,
             prop: "belongtoarea",
             mock: {
-              type: 'county'
+              type: "county"
             }
           }
         ]
       }
-    }
+    };
+  },
+  components: {
+    flowDialog
   },
   created() {
-    corpstypeTree().then(res=>{
-      this.dic = res.data.data
-    })
-    if (this.$route.query.id){
-      let id = this.$route.query.id.replace(/\"/g, "")
+    corpstypeTree().then(res => {
+      this.dic = res.data.data;
+    });
+    if (this.$route.query.id) {
+      let id = this.$route.query.id.replace(/\"/g, "");
       // let id = parseInt(this.$route.query.id)
       detail(id).then(res => {
-        console.log(res.data.data)
+        console.log(res.data.data);
         this.form = res.data.data;
-        this.contactsData = this.form.corpsAttnList
-        this.bankOfDepositData = this.form.corpsBankList
-        this.advantageProjectData = this.form.corpsItems
-        delete this.form.corpsAttnList
-        delete this.form.corpsBankList
-        delete this.form.corpsItems
+        this.contactsData = this.form.corpsAttnList;
+        this.bankOfDepositData = this.form.corpsBankList;
+        this.advantageProjectData = this.form.corpsItems;
+        delete this.form.corpsAttnList;
+        delete this.form.corpsBankList;
+        delete this.form.corpsItems;
       });
+    }else{
+      //新增时根据左侧选中树结构给客户类别赋值
+      this.$set(this.form,"corpsTypeId", this.$route.query.treeDeptId)
     }
   },
-  watch:{
-    '$route'(to,from) {
-      console.log(to,from);
-      if (this.$route.query.id){
-        let id = JSON.parse(this.$route.query.id).replace(/\"/g, "")
+  watch: {
+    $route(to, from) {
+      console.log(to, from);
+      if (this.$route.query.id) {
+        let id = JSON.parse(this.$route.query.id).replace(/\"/g, "");
         detail(id).then(res => {
-          console.log(res.data.data)
+          console.log(res.data.data);
           this.form = res.data.data;
         });
-      }else {
-        this.form = {}
+      } else {
+        this.form = {};
       }
     }
   },
   methods: {
     //新增客户联系人保存触发
-    rowSave(row, done, loading){
-      console.log(row,done,loading)
-      this.contactsData.push(row)
-      done()
+    rowSave(row, done, loading) {
+      console.log(row, done, loading);
+      this.contactsData.push(row);
+      done();
     },
     //修改客户联系人触发
     rowUpdate(row, index, done, loading) {
@@ -427,28 +530,28 @@ export default {
         type: "warning"
       }).then(() => {
         // 数据回调进行刷新
-        if (row.id){
-          corpsattn(row.id).then(res=>{
+        if (row.id) {
+          corpsattn(row.id).then(res => {
             this.$message({
               type: "success",
               message: "操作成功!"
             });
             this.contactsData.splice(index, 1);
-          })
-        }else {
+          });
+        } else {
           this.$message({
             type: "success",
             message: "操作成功!"
           });
           this.contactsData.splice(index, 1);
         }
-      })
+      });
     },
     //新增客户优势项目保存触发
-    rowSaveProject(row, done, loading){
-      console.log(row,done,loading)
-      this.advantageProjectData.push(row)
-      done()
+    rowSaveProject(row, done, loading) {
+      console.log(row, done, loading);
+      this.advantageProjectData.push(row);
+      done();
     },
     //修改客户优势项目触发
     rowUpdateProject(row, index, done, loading) {
@@ -461,28 +564,28 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        if (row.id){
-          corpsitem(row.id).then(res=>{
+        if (row.id) {
+          corpsitem(row.id).then(res => {
             this.$message({
               type: "success",
               message: "操作成功!"
             });
             this.advantageProjectData.splice(index, 1);
-          })
-        }else {
+          });
+        } else {
           this.$message({
             type: "success",
             message: "操作成功!"
           });
           this.advantageProjectData.splice(index, 1);
         }
-      })
+      });
     },
     //新增客户优势项目保存触发
-    rowSaveBankOfDeposit(row, done, loading){
-      console.log(row,done,loading)
-      this.bankOfDepositData.push(row)
-      done()
+    rowSaveBankOfDeposit(row, done, loading) {
+      console.log(row, done, loading);
+      this.bankOfDepositData.push(row);
+      done();
     },
     //修改客户优势项目触发
     rowUpdateBankOfDeposit(row, index, done, loading) {
@@ -495,59 +598,59 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        if (row.id){
-          corpsbank(row.id).then(res=>{
+        if (row.id) {
+          corpsbank(row.id).then(res => {
             this.$message({
               type: "success",
               message: "操作成功!"
             });
             this.bankOfDepositData.splice(index, 1);
-          })
-        }else {
+          });
+        } else {
           this.$message({
             type: "success",
             message: "操作成功!"
           });
           this.bankOfDepositData.splice(index, 1);
         }
-      })
+      });
     },
     //修改提交触发
     editCustomer() {
-      console.log(this.form)
-      this.$refs["form"].validate((valid) => {
+      console.log(this.form);
+      this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.corpsAttnList = this.contactsData
-          this.form.corpsBankList = this.bankOfDepositData
-          this.form.corpsItems = this.advantageProjectData
+          this.form.corpsAttnList = this.contactsData;
+          this.form.corpsBankList = this.bankOfDepositData;
+          this.form.corpsItems = this.advantageProjectData;
           // console.log(typeof(this.form.companytype))
           // this.form.corpsTypeId = JSON.stringify(this.form.corpsTypeId).replace(/[\[\]]/g,"")
           // console.log(typeof this.form.corpsTypeId)
-          if (typeof this.form.corpsTypeId == 'object'){
-            this.form.corpsTypeId = this.form.corpsTypeId.join(",")
+          if (typeof this.form.corpsTypeId == "object") {
+            this.form.corpsTypeId = this.form.corpsTypeId.join(",");
           }
-          this.disabled = true
+          this.disabled = true;
           typeSave(this.form).then(res => {
-            console.log(res.data)
-            if (res.data.data === "error"){
-              this.disabled = false
+            console.log(res.data);
+            if (res.data.data === "error") {
+              this.disabled = false;
               this.$message({
                 showClose: true,
                 message: res.data.msg,
-                type: 'error'
+                type: "error"
               });
-            }else {
+            } else {
               this.$message({
                 type: "success",
                 message: this.form.id ? "修改成功!" : "新增成功!"
               });
               this.$router.$avueRouter.closeTag();
               this.$router.push({
-                path: '/basicData/customerInformation/index',
+                path: "/basicData/customerInformation/index",
                 query: {}
               });
             }
-          })
+          });
         } else {
           return false;
         }
@@ -556,12 +659,18 @@ export default {
     backToList() {
       this.$router.$avueRouter.closeTag();
       this.$router.push({
-        path: '/basicData/customerInformation/index',
+        path: "/basicData/customerInformation/index",
         query: {}
       });
+    },
+    openFlow() {
+      this.switchDialog =! this.switchDialog;
+    },
+    onClose(val) {
+      this.switchDialog = val;
     }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -597,7 +706,11 @@ export default {
   right: 36px;
   top: 115px;
 }
-
+.flow-btn {
+  position: fixed;
+  right: 140px;
+  top: 115px;
+}
 ::v-deep .el-form-item {
   margin-bottom: 0;
 }

src/views/basicData/customerInformation/index.vue

@@ -4,64 +4,74 @@
       <div class="box">
         <el-scrollbar>
           <basic-container>
-            <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/>
+            <avue-tree
+              :option="treeOption"
+              :data="treeData"
+              @node-click="nodeClick"
+            />
           </basic-container>
         </el-scrollbar>
       </div>
     </el-col>
     <el-col :span="19">
       <basic-container>
-        <avue-crud :option="option"
-                   :data="dataList"
-                   ref="crud"
-                   v-model="form"
-                   :page.sync="page"
-                   @row-del="rowDel"
-                   @row-update="rowUpdate"
-                   :before-open="beforeOpen"
-                   :before-close="beforeClose"
-                   @row-save="rowSave"
-                   @search-change="searchChange"
-                   @search-reset="searchReset"
-                   @selection-change="selectionChange"
-                   @current-change="currentChange"
-                   @size-change="sizeChange"
-                   @refresh-change="refreshChange"
-                   @on-load="onLoad"
-                   @tree-load="treeLoad">
+        <avue-crud
+          :option="option"
+          :data="dataList"
+          ref="crud"
+          v-model="form"
+          :page.sync="page"
+          @row-del="rowDel"
+          @row-update="rowUpdate"
+          :before-open="beforeOpen"
+          :before-close="beforeClose"
+          @row-save="rowSave"
+          @search-change="searchChange"
+          @search-reset="searchReset"
+          @selection-change="selectionChange"
+          @current-change="currentChange"
+          @size-change="sizeChange"
+          @refresh-change="refreshChange"
+          @on-load="onLoad"
+          @tree-load="treeLoad"
+        >
           <template slot="menuLeft">
             <el-button
               icon="el-icon-printer"
               size="small"
               type="primary"
-              @click.stop="goReport('客户资料.ureport.xml')"
+              @click.stop="openReport()"
               >报表
             </el-button>
           </template>
           <template slot-scope="scope" slot="menu">
             <el-button
-                type="text"
-                icon="el-icon-view"
-                size="small"
-                @click.stop="beforeOpenPage(scope.row,scope.index)"
-            >查看
+              type="text"
+              icon="el-icon-view"
+              size="small"
+              @click.stop="beforeOpenPage(scope.row, scope.index)"
+              >查看
             </el-button>
             <el-button
-                type="text"
-                icon="el-icon-edit"
-                size="small"
-                @click.stop="editOpen(scope.row,scope.index)"
-            >编辑
+              type="text"
+              icon="el-icon-edit"
+              size="small"
+              @click.stop="editOpen(scope.row, scope.index)"
+              >编辑
             </el-button>
             <el-button
-                type="text"
-                icon="el-icon-delete"
-                size="small"
-                @click.stop="rowDel(scope.row,scope.index)"
-            >删除
+              type="text"
+              icon="el-icon-delete"
+              size="small"
+              @click.stop="rowDel(scope.row, scope.index)"
+              >删除
             </el-button>
           </template>
         </avue-crud>
+        <report-dialog
+          :switchDialog="switchDialog"
+          @onClose="onClose()"
+        ></report-dialog>
       </basic-container>
     </el-col>
   </el-row>
@@ -69,49 +79,63 @@
 
 <script>
 import option from "./configuration/mainList.json";
-import {customerList, typeSave,detail,deleteDetails,getDeptLazyTree} from "@/api/basicData/customerInformation"
-
+import {
+  customerList,
+  typeSave,
+  detail,
+  deleteDetails,
+  getDeptLazyTree
+} from "@/api/basicData/customerInformation";
+import reportDialog from "@/components/report-dialog/main";
 export default {
   name: "customerInformation",
   data() {
     return {
+      reportQuery:{},
+      switchDialog: false,
+      treeDeptId:"",
       form: {},
       option: option,
-      parentId:0,
+      parentId: 0,
       dataList: [],
       treeOption: {
-        nodeKey: 'id',
+        nodeKey: "id",
         lazy: true,
-        treeLoad: function (node, resolve) {
-          const parentId = (node.level === 0) ? 0 : node.data.id;
+        treeLoad: function(node, resolve) {
+          const parentId = node.level === 0 ? 0 : node.data.id;
           getDeptLazyTree(parentId).then(res => {
-            resolve(res.data.data.map(item => {
-              return {
-                ...item,
-                leaf: !item.hasChildren
-              }
-            }))
+            resolve(
+              res.data.data.map(item => {
+                return {
+                  ...item,
+                  leaf: !item.hasChildren
+                };
+              })
+            );
           });
         },
         addBtn: false,
         menu: false,
-        size: 'small',
+        size: "small",
         props: {
-          labelText: '标题',
-          label: 'title',
-          value: 'value',
-          children: 'children'
+          labelText: "标题",
+          label: "title",
+          value: "value",
+          children: "children"
         }
       },
       page: {
         pageSize: 10,
         pagerCount: 5,
-        total: 0,
+        total: 0
       }
-    }
+    };
+  },
+  components: {
+    reportDialog
   },
   created() {
-    console.log('wangbadan')
+    console.log("wangbadan");
     // this.onLoad()
   },
   methods: {
@@ -126,40 +150,45 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(() => {
-        return deleteDetails(row.id);
-      }).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
+      })
+        .then(() => {
+          return deleteDetails(row.id);
+        })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          this.page.currentPage = 1;
+          this.onLoad(this.page, { parentId: 0 });
         });
-        this.page.currentPage = 1;
-        this.onLoad(this.page, {parentId:0});
-      });
     },
     //修改时的修改按钮点击触发
     rowUpdate(row, index, done, loading) {
-      typeSave(row).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        // 数据回调进行刷新
-        done(row);
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
+      typeSave(row).then(
+        () => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          // 数据回调进行刷新
+          done(row);
+        },
+        error => {
+          window.console.log(error);
+          loading();
+        }
+      );
     },
     //新增修改时保存触发
     rowSave(row, done, loading) {
       typeSave(row).then(res => {
-        console.log(res)
-        done()
-      })
+        console.log(res);
+        done();
+      });
     },
     //查询全部
-    initData(){
+    initData() {
       customerList().then(res => {
         console.log(this.form);
         const column = this.findObject(this.option.column, "parentId");
@@ -175,23 +204,23 @@ export default {
       this.$refs.crud.rowAdd();
     },
     //查看跳转页面
-    beforeOpenPage(row,index) {
+    beforeOpenPage(row, index) {
       this.$router.push({
         path: "/detailsPageEdit",
-        query: { id: JSON.stringify(row.id) },
+        query: { id: JSON.stringify(row.id) }
       });
     },
     //新增跳转页面
-    beforeOpen(row,index) {
+    beforeOpen(row, index) {
       this.$router.push({
         path: "/detailsPageEdit",
-        query: { id: JSON.stringify(row.id) },
+        query: { id: JSON.stringify(row.id),treeDeptId:this.treeDeptId }
       });
     },
-    editOpen(row,index){
+    editOpen(row, index) {
       this.$router.push({
         path: "/detailsPageEdit",
-        query: { id: JSON.stringify(row.id) },
+        query: { id: JSON.stringify(row.id) }
       });
     },
     //点击新增时触发
@@ -204,51 +233,56 @@ export default {
     },
     //点击搜索按钮触发
     searchChange(params, done) {
-      console.log(params)
+      console.log(params);
       this.page.currentPage = 1;
       this.onLoad(this.page, params);
-      done()
+      done();
     },
     //搜索重置按钮触发
     searchReset() {
-      this.treeDeptId = '';
+      this.treeDeptId = "";
       this.onLoad(this.page);
     },
     selectionChange() {
-      console.log('1')
+      console.log("1");
     },
     currentChange() {
-      console.log('1')
+      console.log("1");
     },
     sizeChange() {
-      console.log('1')
+      console.log("1");
     },
     refreshChange() {
-      console.log('1')
+      console.log("1");
     },
-    onLoad(page, params = {parentId:0}) {
-      let queryParams = Object.assign({}, params, {size: page.pageSize, current: page.currentPage,corpsTypeId:this.treeDeptId})
+    onLoad(page, params = { parentId: 0 }) {
+      let queryParams = Object.assign({}, params, {
+        size: page.pageSize,
+        current: page.currentPage,
+        corpsTypeId: this.treeDeptId
+      });
       customerList(queryParams).then(res => {
-        this.dataList = res.data.data.records
-        console.log(res.data.data.total)
-        this.page.total = res.data.data.total
-        console.log(this.page)
-      })
+        this.dataList = res.data.data.records;
+        console.log(res.data.data.total);
+        this.page.total = res.data.data.total;
+        console.log(this.page);
+      });
     },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {
       const parentId = tree.id;
-      customerList({parentId:parentId}).then(res => {
+      customerList({ parentId: parentId }).then(res => {
         resolve(res.data.data.records);
       });
     },
-    goReport(name){
-      this.$router.push({path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}`});
+    openReport() {
+      this.switchDialog =! this.switchDialog;
+    },
+    onClose(val) {
+      this.switchDialog = val;
     }
   }
 };
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -287,6 +287,11 @@ export default {
         this.form = res.data.data;
         this.contactsData = this.form.deliveryItemsList
       })
+    }else if (this.$route.query.form){
+      this.form = JSON.parse(this.$route.query.form);
+      this.form.id = null
+      this.contactsData = this.form.orderItemsList
+      delete this.form.orderItemsList
     }
   },
   methods: {

src/views/purchase/contract/detailsPage.vue

@@ -67,6 +67,11 @@
                          @click="commoditySelection"
               >新增
               </el-button>
+              <el-button type="primary"
+                         icon="el-icon-plus"
+                         size="small"
+              >申请付款(开证)
+              </el-button>
             </template>
           </avue-crud>
         </basic-container>

src/views/report/reportlist.vue

@@ -1,26 +1,30 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               ref="crud"
-               v-model="form"
-               :page.sync="page"
-               :permission="permissionList"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      ref="crud"
+      v-model="form"
+      :page.sync="page"
+      :permission="permissionList"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
       <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   @click="handleDelete">删 除
+        <el-button
+          type="danger"
+          size="small"
+          icon="el-icon-delete"
+          plain
+          @click="handleDelete"
+          >删 除
         </el-button>
       </template>
       <template slot-scope="scope" slot="menu">
@@ -30,7 +34,7 @@
           size="small"
           @click.stop="handleDesign(scope.row.name)"
           v-if="userInfo.role_name.includes('admin')"
-        >设计
+          >设计
         </el-button>
         <el-button
           type="text"
@@ -38,20 +42,22 @@
           size="small"
           @click.stop="handlePreview(scope.row.name)"
           v-if="userInfo.role_name.includes('admin')"
-        >预览
+          >预览
         </el-button>
       </template>
-      <template slot-scope="{row}" slot="name">
-        <el-tag style="cursor:pointer" @click="handlePreview(row.name)">{{ row.name }}</el-tag>
+      <template slot-scope="{ row }" slot="name">
+        <el-tag style="cursor:pointer" @click="handlePreview(row.name)">{{
+          row.name | nameFormat
+        }}</el-tag>
       </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
-import {getList, remove} from "@/api/report/report";
-import {mapGetters} from "vuex";
-
+import { getList, remove } from "@/api/report/report";
+import { mapGetters } from "vuex";
+import { nameReportFormat } from "@/filters/report";
 export default {
   data() {
     return {
@@ -65,11 +71,11 @@ export default {
         total: 0
       },
       option: {
-        height: 'auto',
+        height: "auto",
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 18,
         border: true,
         index: true,
         selection: true,
@@ -80,15 +86,15 @@ export default {
             label: "文件名",
             prop: "name",
             search: true,
-            slot: true,
+            slot: true
           },
           {
             label: "创建时间",
-            prop: "createTime",
+            prop: "createTime"
           },
           {
             label: "更新时间",
-            prop: "updateTime",
+            prop: "updateTime"
           }
         ]
       },
@@ -113,12 +119,21 @@ export default {
       return ids.join(",");
     }
   },
+  filters: {
+    nameFormat(name) {
+      return nameReportFormat(name);
+    }
+  },
   methods: {
     handlePreview(name) {
-      this.$router.push({path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}`});
+      this.$router.push({
+        path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}`
+      });
     },
     handleDesign(name) {
-      this.$router.push({path: `/myiframe/urlPath?name=designer-${name}&src=${this.website.reportUrl}/designer?_u=blade-${name}`});
+      this.$router.push({
+        path: `/myiframe/urlPath?name=designer-${name}&src=${this.website.reportUrl}/designer?_u=blade-${name}`
+      });
     },
     rowDel(row) {
       this.$confirm("确定将选择数据删除?", {
@@ -187,7 +202,11 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query)
+      ).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
@@ -199,5 +218,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>

src/views/salesManagement/salesContract/detailsPage.vue

@@ -68,6 +68,11 @@
                          :disabled="selection.length < 1"
                          @click="generateShipmentD">生成发货单
               </el-button>
+              <el-button type="primary"
+                         icon="el-icon-plus"
+                         size="small"
+              >收款记录
+              </el-button>
             </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button
@@ -235,7 +240,8 @@ import {detailSaleList,
   submitData,
   goodsListRemove,
   feesListRemove,
-  updateListRemove,} from "@/api/importTrade/salesContract"
+  updateListRemove,
+  generateShipment} from "@/api/importTrade/salesContract"
 
 export default {
   name: "detailsPage",
@@ -672,9 +678,8 @@ export default {
         orderItemIds: lsit
       }
       generateShipment(data).then(res=>{
-        console.log(res.data.data)
         this.$router.push({
-          path: "deliveryNotice_detailsPageEdit",
+          path: "importInvoice_detailsPage",
           query: {form: JSON.stringify(res.data.data)},
         });
       })

src/views/workManagement/main-items/configuration/detailsPage.json

@@ -84,6 +84,7 @@
     {
       "label": "任务部门",
       "prop": "deptId",
+      "slot": true,
       "index": 11,
       "width": 100,
       "cell": true

src/views/workManagement/main-items/detailsPage.vue

@@ -5,6 +5,9 @@
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
                    @click="backToList">返回列表
         </el-button>
+        <el-button class="el-button--small-yh add-customer-btn" type="primary"
+        >保存
+        </el-button>
       </div>
     </div>
     <div style="margin-top: 60px">
@@ -157,6 +160,9 @@
                        @selection-change="serviceSelectionChange"
                        @search-change="serviceSearchChange"
                        @on-load="serviceOnLoad">
+              <template slot-scope="" slot="deptId" >
+
+              </template>
             </avue-crud>
           </basic-container>
         </el-col>
@@ -298,7 +304,7 @@
               type:'select',
               dataType: "number",
               width: 120,
-              dicUrl: "/api/blade-system/dict/dictionary?code=payment_term",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
               props: {
                 label: "dictValue",
                 value: "dictKey"
@@ -581,4 +587,9 @@
     overflow: hidden;
     max-height: 660px;
   }
+  .add-customer-btn {
+    position: fixed;
+    right: 36px;
+    top: 115px;
+  }
 </style>

src/views/workManagement/main-items/list.vue

@@ -19,11 +19,8 @@
       @saveColumn="saveColumn"
     >
       <template slot="menuLeft">
-        <el-button type="primary"
-                   size="small"
-                   icon="el-icon-arrow-right"
-                   plain
-                   @click="">导 出
+        <el-button type="primary" size="small" icon="el-icon-arrow-right" plain
+          >导 出
         </el-button>
         <el-button type="success"
                    size="small"
@@ -32,9 +29,15 @@
                    @click="addMainItems">新 单
         </el-button>
       </template>
-    <template slot-scope="scope" slot="menu">
-      <el-button icon="el-icon-check"  size="small" type="text" @click.stop="beforeOpenPage(scope.row,scope.index)">详 情</el-button>
-    </template>
+      <template slot-scope="scope" slot="menu">
+        <el-button
+          icon="el-icon-check"
+          size="small"
+          type="text"
+          @click.stop="beforeOpenPage(scope.row, scope.index)"
+          >详 情</el-button
+        >
+      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -150,10 +153,10 @@ export default {
       console.log(row, column);
     },
     //打开详情页
-    beforeOpenPage(row,index){
+    beforeOpenPage(row, index) {
       this.$router.push({
         path: "/mainItems_detailsPage",
-        query: {id: JSON.stringify(row.prop1)},
+        query: { id: JSON.stringify(row.prop1) }
       });
     }
   }

src/views/workManagement/service-items/configuration/projectOption.json

@@ -6,7 +6,7 @@
   "lazy": true,
   "tip": false,
   "searchShow": true,
-  "searchMenuSpan": 6,
+  "searchMenuSpan": 12,
   "tree": true,
   "selection": true,
   "viewBtn": false,

src/views/workManagement/service-items/project.vue

@@ -64,6 +64,7 @@ export default {
       search:{},
       treeDeptId:"",
       treeDeptName:'',
+      height: window.innerHeight - 350,
       page: {
         currentPage: 1,
         total: 0,
@@ -103,8 +104,6 @@ export default {
     getDeptTree().then(res => {
       this.findObject(this.tableOption.column, "goodsTypeId").dicData = res.data.data;
     });
-    // getDicData("payment_term").then(res =>{
-    // })
   },
   methods: {
     getList(page, params = {}) {
@@ -128,7 +127,6 @@ export default {
             this.$set(this.tableOption.column,2,{...e,value:this.treeDeptId})
           }
         })
-
       }
       if (["edit"].includes(type)) {
         detail(this.form.id).then(res => {
@@ -220,4 +218,5 @@ export default {
 };
 </script>
 
-<style></style>
+<style scoped lang="scss">
+</style>