Merge branch 'master' of http://git.echepei.com/zhujiawei/Warehouse_management_ui

README.md

@@ -2,10 +2,10 @@
 
 ```bash
 # 克隆项目
-git clone https://gitee.com/y_project/RuoYi-Vue
+git clone root@git.echepei.com:zhujiawei/Warehouse_management_ui.git
 
 # 进入项目目录
-cd ruoyi-ui
+cd Warehouse_management_ui
 
 # 安装依赖
 npm install

src/api/finance/contrast.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询财务数据主列表
+export function listFee(query) {
+  return request({
+    url: '/finance/contrast/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询财务数据主详细
+export function getFee(fId) {
+  return request({
+    url: '/finance/contrast/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增财务数据主
+export function addFee(data) {
+  return request({
+    url: '/finance/contrast',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改财务数据主
+export function updateFee(data) {
+  return request({
+    url: '/finance/contrast',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除财务数据主
+export function delFee(fId) {
+  return request({
+    url: '/finance/contrast/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出财务数据主
+export function exportFee(query) {
+  return request({
+    url: '/finance/contrast/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/agreement/agreementTask/index.vue

@@ -201,9 +201,9 @@
     />
 
     <!-- 添加或修改作业费对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="85%" append-to-body :before-close="handleClose" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="65%" append-to-body :before-close="handleClose" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px"
-               style="display: flex;flex-wrap: wrap;justify-content: flex-start;"
+               style="display: flex;flex-wrap: wrap;"
       >
         <el-form-item label="客户名称" prop="fCorpid">
           <el-select
@@ -262,7 +262,7 @@
           </el-select>
         </el-form-item>
       </el-form>
-      <el-button type="primary" @click="">请 核</el-button>
+      <el-button type="primary">请 核</el-button>
       <div class="dialogTableTitle flex a-center jlr">
         <h2>标题</h2>
         <el-button @click="getList_s()">新增</el-button>

src/views/basicdata/corps/index.vue

@@ -455,6 +455,7 @@
 
 <script>
   import { listCorps, getCorps, delCorps, addCorps, updateCorps, changeCorpsStatus,exportCorps } from "@/api/basicdata/corps";
+  import {queryUserVal} from "@/api/system/user";
 
   export default {
     name: "Corps",
@@ -559,6 +560,11 @@
       });
     },
     methods: {
+      // 客户类别默认为客户结算方式默认月结
+      query() {
+        this.$set(this.form, "fStltypeid", 1);
+        this.$set(this.form, "fTypeid", "1");
+      },
       // 添加行
       addRow(tableData,event){
         var obj = {}
@@ -635,6 +641,10 @@
         };
         this.resetForm("form");
       },
+      // 从表重置
+      contList() {
+        this.contactList = []
+      },
       // 状态修改
       handleStatusChange(row) {
         let text = row.fStatus === "0" ? "启用" : "停用";
@@ -669,6 +679,8 @@
       /** 新增按钮操作 */
       handleAdd() {
         this.reset();
+        this.query();
+        this.contList();
         this.open = true;
         this.title = "添加客户详情";
       },
@@ -688,7 +700,15 @@
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.fId != null) {
-              updateCorps(this.form).then(response => {
+              /*updateCorps(this.form).then(response => {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });*/
+              let formDate= new FormData()
+              formDate.append('corps',JSON.stringify(this.form));
+              formDate.append('customerContacts',JSON.stringify(this.contactList));
+              addCorps(formDate).then(response => {
                 this.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();

src/views/basicdata/fees/index.vue

@@ -191,7 +191,7 @@
                   v-for="dict in fFeeunitidOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :value="parseInt(dict.dictValue)"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -300,6 +300,11 @@ export default {
     });
   },
   methods: {
+    // 费用属性默认为仓储、计量单位默认为毛重
+    query() {
+      this.$set(this.form, "fFeetype", "1");
+      this.$set(this.form, "fFeeunitid", 1);
+    },
     /** 查询费用信息列表 */
     getList() {
       this.loading = true;
@@ -364,6 +369,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.query();
       this.open = true;
       this.title = "添加费用信息";
     },

src/views/basicdata/goods/index.vue

@@ -273,7 +273,7 @@
                   v-for="dict in fTypeidOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :value="parseInt(dict.dictValue)"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -355,6 +355,9 @@
           fName: [
             { required: true, message: "名称不能为空", trigger: "blur" }
           ],
+          fTypeid: [
+            { required: true, message: "商品类别不能为空", trigger: "blur" }
+          ],
         }
       };
     },

src/views/basicdata/warehouse/index.vue

@@ -307,6 +307,9 @@ export default {
         fAddr: [
           { required: true, message: "地址不能为空", trigger: "blur" }
         ],
+        fTotalgross: [
+          { required: true, message: "库容不能为空", trigger: "blur" }
+        ],
       }
     };
   },

src/views/finance/contrast/index.vue

@@ -0,0 +1,466 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="业务编号(唯一格式+YYYY+YY+NNN，
+编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
+对账 DZ
+
+收费 SF
+
+付费 FF
+
+发票 FP" prop="fBillno">
+        <el-input
+          v-model="queryParams.fBillno"
+          placeholder="请输入业务编号(唯一格式+YYYY+YY+NNN，
+编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
+对账 DZ
+
+收费 SF
+
+付费 FF
+
+发票 FP"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货权方" prop="fCtrlcorpid">
+        <el-select v-model="queryParams.fCtrlcorpid" placeholder="请选择货权方" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="结算单位(下拉模糊搜索)" prop="fCorpid">
+        <el-select v-model="queryParams.fCorpid" placeholder="请选择结算单位(下拉模糊搜索)" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="提单号" prop="tMblno">
+        <el-input
+          v-model="queryParams.tMblno"
+          placeholder="请输入提单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="应收合计" prop="fAmtdr">
+        <el-input
+          v-model="queryParams.fAmtdr"
+          placeholder="请输入应收合计"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="应付合计" prop="fAmtcr">
+        <el-input
+          v-model="queryParams.fAmtcr"
+          placeholder="请输入应付合计"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)" prop="fBilltype">
+        <el-select v-model="queryParams.fBilltype" placeholder="请选择单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="fBillstatus">
+        <el-select v-model="queryParams.fBillstatus" placeholder="请选择状态" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="备注" prop="fRemarks">
+        <el-input
+          v-model="queryParams.fRemarks"
+          placeholder="请输入备注"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="账单日期(审批流结束后更新)" prop="fAccbilldate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.fAccbilldate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择账单日期(审批流结束后更新)">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="制单部门" prop="fDeptid">
+        <el-select v-model="queryParams.fDeptid" placeholder="请选择制单部门" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['warehouse:fee:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['warehouse:fee:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['warehouse:fee:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['warehouse:fee:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="feeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="制单部门" align="center" prop="fId" />
+      <el-table-column label="业务编号(唯一格式+YYYY+YY+NNN，
+编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
+对账 DZ
+
+收费 SF
+
+付费 FF
+
+发票 FP" align="center" prop="fBillno" />
+      <el-table-column label="货权方" align="center" prop="fCtrlcorpid" />
+      <el-table-column label="结算单位(下拉模糊搜索)" align="center" prop="fCorpid" />
+      <el-table-column label="提单号" align="center" prop="tMblno" />
+      <el-table-column label="应收合计" align="center" prop="fAmtdr" />
+      <el-table-column label="应付合计" align="center" prop="fAmtcr" />
+      <el-table-column label="单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)" align="center" prop="fBilltype" />
+      <el-table-column label="状态" align="center" prop="fBillstatus" />
+      <el-table-column label="备注" align="center" prop="fRemarks" />
+      <el-table-column label="账单日期(审批流结束后更新)" align="center" prop="fAccbilldate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fAccbilldate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="制单部门" align="center" prop="fDeptid" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['warehouse:fee:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['warehouse:fee:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改财务数据主对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="业务编号(唯一格式+YYYY+YY+NNN，
+编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
+对账 DZ
+
+收费 SF
+
+付费 FF
+
+发票 FP" prop="fBillno">
+          <el-input v-model="form.fBillno" placeholder="请输入业务编号(唯一格式+YYYY+YY+NNN，
+编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
+对账 DZ
+
+收费 SF
+
+付费 FF
+
+发票 FP" />
+        </el-form-item>
+        <el-form-item label="货权方" prop="fCtrlcorpid">
+          <el-select v-model="form.fCtrlcorpid" placeholder="请选择货权方">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="结算单位(下拉模糊搜索)" prop="fCorpid">
+          <el-select v-model="form.fCorpid" placeholder="请选择结算单位(下拉模糊搜索)">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="提单号" prop="tMblno">
+          <el-input v-model="form.tMblno" placeholder="请输入提单号" />
+        </el-form-item>
+        <el-form-item label="应收合计" prop="fAmtdr">
+          <el-input v-model="form.fAmtdr" placeholder="请输入应收合计" />
+        </el-form-item>
+        <el-form-item label="应付合计" prop="fAmtcr">
+          <el-input v-model="form.fAmtcr" placeholder="请输入应付合计" />
+        </el-form-item>
+        <el-form-item label="单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)" prop="fBilltype">
+          <el-select v-model="form.fBilltype" placeholder="请选择单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.fBillstatus">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="fRemarks">
+          <el-input v-model="form.fRemarks" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="账单日期(审批流结束后更新)" prop="fAccbilldate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.fAccbilldate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择账单日期(审批流结束后更新)">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="删除状态" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+        <el-form-item label="制单部门" prop="fDeptid">
+          <el-select v-model="form.fDeptid" placeholder="请选择制单部门">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listFee, getFee, delFee, addFee, updateFee, exportFee } from "@/api/finance/contrast";
+
+export default {
+  name: "Fee",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 财务数据主表格数据
+      feeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fBillno: null,
+        fCtrlcorpid: null,
+        fCorpid: null,
+        tMblno: null,
+        fAmtdr: null,
+        fAmtcr: null,
+        fBilltype: null,
+        fBillstatus: null,
+        fRemarks: null,
+        fAccbilldate: null,
+        fDeptid: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        fCtrlcorpid: [
+          { required: true, message: "货权方不能为空", trigger: "change" }
+        ],
+        fCorpid: [
+          { required: true, message: "结算单位(下拉模糊搜索)不能为空", trigger: "change" }
+        ],
+        fBilltype: [
+          { required: true, message: "单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)不能为空", trigger: "change" }
+        ],
+        fBillstatus: [
+          { required: true, message: "状态不能为空", trigger: "blur" }
+        ],
+        fDeptid: [
+          { required: true, message: "制单部门不能为空", trigger: "change" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询财务数据主列表 */
+    getList() {
+      this.loading = true;
+      listFee(this.queryParams).then(response => {
+        this.feeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fId: null,
+        fBillno: null,
+        fCtrlcorpid: null,
+        fCorpid: null,
+        tMblno: null,
+        fAmtdr: null,
+        fAmtcr: null,
+        fBilltype: null,
+        fBillstatus: "0",
+        fRemarks: null,
+        fAccbilldate: null,
+        delFlag: null,
+        createBy: null,
+        fDeptid: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.fId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加财务数据主";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const fId = row.fId || this.ids
+      getFee(fId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改财务数据主";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.fId != null) {
+            updateFee(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFee(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const fIds = row.fId || this.ids;
+      this.$confirm('是否确认删除财务数据主编号为"' + fIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delFee(fIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有财务数据主数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportFee(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>

src/views/index.vue

@@ -75,20 +75,20 @@
         </el-select>
       </div>
     </div>
-    <div style="width: 100%;margin-bottom: 50px">
+    <div style="width: 100%;margin-bottom: 50px;">
       <el-table :data="tableData" :header-cell-style="{borderBottom:'1px dashed #dfe6ec'}" :cell-style="cellStyle"
-                style="width: 65%;float: left;"
+                style="width: 67.5%;float: left;"
       >
-        <el-table-column prop="name" label="待办事宜" width="360">
+        <el-table-column prop="name" label="待办事宜">
         </el-table-column>
-        <el-table-column prop="date" label="时间" width="300"></el-table-column>
-        <el-table-column prop="address" label="操作"></el-table-column>
+        <el-table-column prop="date" label="时间"></el-table-column>
+        <el-table-column prop="address" label="操作" width="80"></el-table-column>
       </el-table>
       <el-table :data="tableDataTwo" :header-cell-style="{borderBottom:'1px dashed #dfe6ec'}" :cell-style="cellStyle"
-                style="width: 30%;float: left;margin-left: 20px;margin-right: 20px;"
+                style="width: 30%;float: right;margin-left: 20px;"
       >
-        <el-table-column prop="noticeTitle" :show-overflow-tooltip="true" label="消息中心" width="260"/>
-        <el-table-column prop="address" label="操作">
+        <el-table-column prop="noticeTitle" :show-overflow-tooltip="true" label="消息中心"/>
+        <el-table-column prop="address" label="操作" width="80">
           <span @click="bug()" style="cursor:pointer">查看详情</span>
           <template slot-scope="scope">
             <span @click="bug(scope.row.noticeContent)" style="cursor:pointer">查看详情</span>
@@ -98,8 +98,9 @@
     </div>
     <div style="width: 100%;float: left;margin-top:20px;">
       <div style="display: flex;">
-        <div id="box_s" style="width:100%;height:350px;"></div>
-        <div id="box_ss" style="width:100%;height:350px;"></div>
+        <div id="box_s" style="width:33%;height:350px;"></div>
+        <div id="box_" style="width:33%;height:350px;"></div>
+        <div id="box_ss" style="width:30%;height:350px;margin-left: 40px"></div>
       </div>
     </div>
     <el-dialog
@@ -188,6 +189,7 @@ export default {
         this.drawLine()
         this.drawLinetwo()
         this.drawLine_ss()
+        this.drawLinetwos()
       })
     },
     query() {
@@ -355,13 +357,58 @@ export default {
         ]
       })
     },
+    drawLinetwos() {
+      // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
+      let myChart = this.$echarts.init(document.getElementById('box_'))
+      // 绘制图表
+      myChart.setOption({
+        title: {
+          text: '数据统计',
+          subtext: '实时数据',
+          left: 'center'
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b}: {c} ({d}%)'
+        },
+        legend: {
+          bottom: 10,
+          left: 'center',
+          data: this.name
+        },
+        series: [
+          {
+            name: '访问来源',
+            type: 'pie',
+            radius: ['40%', '60%'],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: 'center'
+            },
+            emphasis: {
+              label: {
+                // show: true,
+                fontSize: '30',
+                fontWeight: 'bold'
+              }
+            },
+            labelLine: {
+              show: false
+            },
+            data:
+            this.master
+          }
+        ]
+      })
+    },
     drawLinetwo() {
       // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
       let myChart = this.$echarts.init(document.getElementById('box_s'))
       // 绘制图表
       myChart.setOption({
         title: {
-          text: this.chart.whouseList[0].fName + '货权人统计',
+          text: this.chart.whouseList[0].fName + '货权方统计',
           subtext: '实时数据',
           left: 'center'
         },
@@ -453,12 +500,21 @@ export default {
 
 <style scoped lang="scss">
 .block {
-  width: 70%;
+  width: 68%;
   float: left;
   display: flex;
   flex-wrap: wrap;
+  justify-content: space-around;
   height: 350px;
-
+  li:hover{
+    background-color: #025184;
+  }
+  li:nth-child(6),li:nth-child(7),li:nth-child(8),li:nth-child(9),li:nth-child(10){
+    background-color: #2f4554;
+  }
+  li:nth-child(6):hover,li:nth-child(7):hover,li:nth-child(8):hover,li:nth-child(9):hover,li:nth-child(10):hover{
+    background-color: #2f4454d1;
+  }
   li {
     width: 18%;
     height: 150px;

src/views/warehouseBusiness/agreement/index.vue

@@ -201,9 +201,9 @@
     />
 
     <!-- 添加或修改仓储费对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="85%" append-to-body :before-close="handleClose" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="65%" append-to-body :before-close="handleClose" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px"
-               style="display: flex;flex-wrap: wrap;justify-content: flex-start;"
+               style="display: flex;flex-wrap: wrap;"
       >
         <el-form-item label="客户名称" prop="fCorpid">
           <el-select
@@ -262,7 +262,7 @@
           </el-select>
         </el-form-item>
       </el-form>
-      <el-button type="primary" @click="">请 核</el-button>
+      <el-button type="primary">请 核</el-button>
       <div class="dialogTableTitle flex a-center jlr">
         <h2>标题</h2>
         <el-button @click="getList_s()">新增</el-button>

vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.137.73:9010`,
-        target: `http://engineering.echepei.com:9010/`,
+        target: `http://192.168.2.3:9010`,
+        // target: `http://engineering.echepei.com:9010/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''