caojunjie 4 năm trước cách đây
mục cha
commit
5c36e9da51

+ 3 - 2
package.json

@@ -44,21 +44,22 @@
     "axios": "0.18.1",
     "clipboard": "2.0.4",
     "core-js": "3.6.5",
+    "corps": "^0.1.0",
     "echarts": "4.2.1",
     "element-ui": "2.14.1",
     "file-saver": "2.0.1",
-    "js-beautify": "1.10.2",
     "fuse.js": "3.4.4",
+    "js-beautify": "1.10.2",
     "js-cookie": "2.2.0",
     "jsencrypt": "3.0.0-rc.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
+    "quill": "1.3.7",
     "screenfull": "4.2.0",
     "sortablejs": "1.8.4",
     "vue": "2.6.10",
     "vue-count-to": "1.0.13",
-    "quill": "1.3.7",
     "vue-cropper": "0.4.9",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",

+ 53 - 0
src/api/basicdata/customerinformation/corps.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询客户详情列表
+export function listCorps(query) {
+  return request({
+    url: '/basicdata/customerinformation/corps/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询客户详情详细
+export function getCorps(fId) {
+  return request({
+    url: '/basicdata/customerinformation/corps/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增客户详情
+export function addCorps(data) {
+  return request({
+    url: '/basicdata/customerinformation/corps',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改客户详情
+export function updateCorps(data) {
+  return request({
+    url: '/basicdata/customerinformation/corps',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除客户详情
+export function delCorps(fId) {
+  return request({
+    url: '/basicdata/customerinformation/corps/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出客户详情
+export function exportCorps(query) {
+  return request({
+    url: '/basicdata/customerinformation/corps/export',
+    method: 'get',
+    params: query
+  })
+}

+ 53 - 0
src/api/basicdata/goods.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询商品详情列表
+export function listGoods(query) {
+  return request({
+    url: '/basicdata/goods/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询商品详情详细
+export function getGoods(fId) {
+  return request({
+    url: '/basicdata/goods/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增商品详情
+export function addGoods(data) {
+  return request({
+    url: '/basicdata/goods',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改商品详情
+export function updateGoods(data) {
+  return request({
+    url: '/basicdata/goods',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除商品详情
+export function delGoods(fId) {
+  return request({
+    url: '/basicdata/goods/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出商品详情
+export function exportGoods(query) {
+  return request({
+    url: '/basicdata/goods/export',
+    method: 'get',
+    params: query
+  })
+}

+ 716 - 0
src/views/basicdata/customerinformation/corps/index.vue

@@ -0,0 +1,716 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="客户类别" prop="fTypeid">
+        <el-select v-model="queryParams.fTypeid" placeholder="请选择客户类别" clearable size="small">
+          <el-option
+            v-for="dict in fTypeidOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="编号" prop="fNo">
+        <el-input
+          v-model="queryParams.fNo"
+          placeholder="请输入编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="简称" prop="fCname">
+        <el-input
+          v-model="queryParams.fCname"
+          placeholder="请输入简称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="名称" prop="fName">
+        <el-input
+          v-model="queryParams.fName"
+          placeholder="请输入名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="英文名称" prop="fEname">
+        <el-input
+          v-model="queryParams.fEname"
+          placeholder="请输入英文名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="电话" prop="fTel">
+        <el-input
+          v-model="queryParams.fTel"
+          placeholder="请输入电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="传真" prop="fFax">
+        <el-input
+          v-model="queryParams.fFax"
+          placeholder="请输入传真"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="邮箱" prop="fEmail">
+        <el-input
+          v-model="queryParams.fEmail"
+          placeholder="请输入邮箱"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系人" prop="fManage">
+        <el-input
+          v-model="queryParams.fManage"
+          placeholder="请输入联系人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="地址" prop="fAddr">
+        <el-input
+          v-model="queryParams.fAddr"
+          placeholder="请输入地址"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="英文地址" prop="fEaddr">
+        <el-input
+          v-model="queryParams.fEaddr"
+          placeholder="请输入英文地址"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规模" prop="fScale">
+        <el-input
+          v-model="queryParams.fScale"
+          placeholder="请输入规模"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="省" prop="fProvince">
+        <el-input
+          v-model="queryParams.fProvince"
+          placeholder="请输入省"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="市" prop="fCity">
+        <el-input
+          v-model="queryParams.fCity"
+          placeholder="请输入市"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="结算表票结、月结" prop="fStltypeid">
+        <el-input
+          v-model="queryParams.fStltypeid"
+          placeholder="请输入结算表票结、月结"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="结费天数" prop="fStldays">
+        <el-input
+          v-model="queryParams.fStldays"
+          placeholder="请输入结费天数"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="合同号" prop="fContractno">
+        <el-input
+          v-model="queryParams.fContractno"
+          placeholder="请输入合同号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="合同起" prop="fContractb">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.fContractb"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择合同起">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="合同至" prop="fContracte">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.fContracte"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择合同至">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="税号" prop="fTax">
+        <el-input
+          v-model="queryParams.fTax"
+          placeholder="请输入税号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开票电话" prop="fInvtel">
+        <el-input
+          v-model="queryParams.fInvtel"
+          placeholder="请输入开票电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开票地址" prop="fInvaddr">
+        <el-input
+          v-model="queryParams.fInvaddr"
+          placeholder="请输入开票地址"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="本位币账号" prop="fBankno">
+        <el-input
+          v-model="queryParams.fBankno"
+          placeholder="请输入本位币账号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="本位币银行" prop="fBankname">
+        <el-input
+          v-model="queryParams.fBankname"
+          placeholder="请输入本位币银行"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="外币账号" prop="fUbankno">
+        <el-input
+          v-model="queryParams.fUbankno"
+          placeholder="请输入外币账号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="外币银行" prop="fUbankname">
+        <el-input
+          v-model="queryParams.fUbankname"
+          placeholder="请输入外币银行"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态默认 T ,正常T 停用F 下拉选择" prop="fStatus">
+        <el-select v-model="queryParams.fStatus" placeholder="请选择状态默认 T ,正常T 停用F 下拉选择" 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="['basicdata/customerinformation:corps: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="['basicdata/customerinformation:corps: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="['basicdata/customerinformation:corps:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['basicdata/customerinformation:corps:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="corpsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="状态默认 T ,正常T 停用F 下拉选择" align="center" prop="fId" />
+      <el-table-column label="客户类别" align="center" prop="fTypeid" :formatter="fTypeidFormat" />
+      <el-table-column label="编号" align="center" prop="fNo" />
+      <el-table-column label="简称" align="center" prop="fCname" />
+      <el-table-column label="名称" align="center" prop="fName" />
+      <el-table-column label="英文名称" align="center" prop="fEname" />
+      <el-table-column label="电话" align="center" prop="fTel" />
+      <el-table-column label="传真" align="center" prop="fFax" />
+      <el-table-column label="邮箱" align="center" prop="fEmail" />
+      <el-table-column label="联系人" align="center" prop="fManage" />
+      <el-table-column label="地址" align="center" prop="fAddr" />
+      <el-table-column label="英文地址" align="center" prop="fEaddr" />
+      <el-table-column label="规模" align="center" prop="fScale" />
+      <el-table-column label="省" align="center" prop="fProvince" />
+      <el-table-column label="市" align="center" prop="fCity" />
+      <el-table-column label="结算表票结、月结" align="center" prop="fStltypeid" :formatter="fStltypeidFormat" />
+      <el-table-column label="结费天数" align="center" prop="fStldays" />
+      <el-table-column label="合同号" align="center" prop="fContractno" />
+      <el-table-column label="合同起" align="center" prop="fContractb" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fContractb, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="合同至" align="center" prop="fContracte" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fContracte, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="税号" align="center" prop="fTax" />
+      <el-table-column label="开票电话" align="center" prop="fInvtel" />
+      <el-table-column label="开票地址" align="center" prop="fInvaddr" />
+      <el-table-column label="本位币账号" align="center" prop="fBankno" />
+      <el-table-column label="本位币银行" align="center" prop="fBankname" />
+      <el-table-column label="外币账号" align="center" prop="fUbankno" />
+      <el-table-column label="外币银行" align="center" prop="fUbankname" />
+      <el-table-column label="状态默认 T ,正常T 停用F 下拉选择" align="center" prop="fStatus" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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="['basicdata/customerinformation:corps:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['basicdata/customerinformation:corps: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="客户类别" prop="fTypeid">
+          <el-select v-model="form.fTypeid" placeholder="请选择客户类别">
+            <el-option
+              v-for="dict in fTypeidOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="编号" prop="fNo">
+          <el-input v-model="form.fNo" placeholder="请输入编号" />
+        </el-form-item>
+        <el-form-item label="简称" prop="fCname">
+          <el-input v-model="form.fCname" placeholder="请输入简称" />
+        </el-form-item>
+        <el-form-item label="名称" prop="fName">
+          <el-input v-model="form.fName" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="英文名称" prop="fEname">
+          <el-input v-model="form.fEname" placeholder="请输入英文名称" />
+        </el-form-item>
+        <el-form-item label="电话" prop="fTel">
+          <el-input v-model="form.fTel" placeholder="请输入电话" />
+        </el-form-item>
+        <el-form-item label="传真" prop="fFax">
+          <el-input v-model="form.fFax" placeholder="请输入传真" />
+        </el-form-item>
+        <el-form-item label="邮箱" prop="fEmail">
+          <el-input v-model="form.fEmail" placeholder="请输入邮箱" />
+        </el-form-item>
+        <el-form-item label="联系人" prop="fManage">
+          <el-input v-model="form.fManage" placeholder="请输入联系人" />
+        </el-form-item>
+        <el-form-item label="地址" prop="fAddr">
+          <el-input v-model="form.fAddr" placeholder="请输入地址" />
+        </el-form-item>
+        <el-form-item label="英文地址" prop="fEaddr">
+          <el-input v-model="form.fEaddr" placeholder="请输入英文地址" />
+        </el-form-item>
+        <el-form-item label="规模" prop="fScale">
+          <el-input v-model="form.fScale" placeholder="请输入规模" />
+        </el-form-item>
+        <el-form-item label="省" prop="fProvince">
+          <el-input v-model="form.fProvince" placeholder="请输入省" />
+        </el-form-item>
+        <el-form-item label="市" prop="fCity">
+          <el-input v-model="form.fCity" placeholder="请输入市" />
+        </el-form-item>
+        <el-form-item label="结算表票结、月结" prop="fStltypeid">
+          <el-input v-model="form.fStltypeid" placeholder="请输入结算表票结、月结" />
+        </el-form-item>
+        <el-form-item label="结费天数" prop="fStldays">
+          <el-input v-model="form.fStldays" placeholder="请输入结费天数" />
+        </el-form-item>
+        <el-form-item label="合同号" prop="fContractno">
+          <el-input v-model="form.fContractno" placeholder="请输入合同号" />
+        </el-form-item>
+        <el-form-item label="合同起" prop="fContractb">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.fContractb"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择合同起">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="合同至" prop="fContracte">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.fContracte"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择合同至">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="税号" prop="fTax">
+          <el-input v-model="form.fTax" placeholder="请输入税号" />
+        </el-form-item>
+        <el-form-item label="开票电话" prop="fInvtel">
+          <el-input v-model="form.fInvtel" placeholder="请输入开票电话" />
+        </el-form-item>
+        <el-form-item label="开票地址" prop="fInvaddr">
+          <el-input v-model="form.fInvaddr" placeholder="请输入开票地址" />
+        </el-form-item>
+        <el-form-item label="本位币账号" prop="fBankno">
+          <el-input v-model="form.fBankno" placeholder="请输入本位币账号" />
+        </el-form-item>
+        <el-form-item label="本位币银行" prop="fBankname">
+          <el-input v-model="form.fBankname" placeholder="请输入本位币银行" />
+        </el-form-item>
+        <el-form-item label="外币账号" prop="fUbankno">
+          <el-input v-model="form.fUbankno" placeholder="请输入外币账号" />
+        </el-form-item>
+        <el-form-item label="外币银行" prop="fUbankname">
+          <el-input v-model="form.fUbankname" placeholder="请输入外币银行" />
+        </el-form-item>
+        <el-form-item label="状态默认 T ,正常T 停用F 下拉选择">
+          <el-radio-group v-model="form.fStatus">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="删除状态" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </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 { listCorps, getCorps, delCorps, addCorps, updateCorps, exportCorps } from "@/api/basicdata/customerinformation/corps";
+
+  export default {
+    name: "Corps",
+    components: {
+    },
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 客户详情表格数据
+        corpsList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 客户类别字典
+        fTypeidOptions: [],
+        // 结算表票结、月结字典
+        fStltypeidOptions: [],
+        // 删除状态字典
+        delFlagOptions: [],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          fTypeid: null,
+          fNo: null,
+          fCname: null,
+          fName: null,
+          fEname: null,
+          fTel: null,
+          fFax: null,
+          fEmail: null,
+          fManage: null,
+          fAddr: null,
+          fEaddr: null,
+          fScale: null,
+          fProvince: null,
+          fCity: null,
+          fStltypeid: null,
+          fStldays: null,
+          fContractno: null,
+          fContractb: null,
+          fContracte: null,
+          fTax: null,
+          fInvtel: null,
+          fInvaddr: null,
+          fBankno: null,
+          fBankname: null,
+          fUbankno: null,
+          fUbankname: null,
+          fStatus: null,
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          fNo: [
+            { required: true, message: "编号不能为空", trigger: "blur" }
+          ],
+          fName: [
+            { required: true, message: "名称不能为空", trigger: "blur" }
+          ],
+          fStatus: [
+            { required: true, message: "状态默认 T ,正常T 停用F 下拉选择不能为空", trigger: "blur" }
+          ],
+        }
+      };
+    },
+    created() {
+      this.getList();
+      this.getDicts("data_customer_category").then(response => {
+        this.fTypeidOptions = response.data;
+      });
+      this.getDicts("data_stltype_type").then(response => {
+        this.fStltypeidOptions = response.data;
+      });
+      this.getDicts("data_delete_state").then(response => {
+        this.delFlagOptions = response.data;
+      });
+    },
+    methods: {
+      /** 查询客户详情列表 */
+      getList() {
+        this.loading = true;
+        listCorps(this.queryParams).then(response => {
+          this.corpsList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 客户类别字典翻译
+      fTypeidFormat(row, column) {
+        return this.selectDictLabel(this.fTypeidOptions, row.fTypeid);
+      },
+      // 结算表票结、月结字典翻译
+      fStltypeidFormat(row, column) {
+        return this.selectDictLabel(this.fStltypeidOptions, row.fStltypeid);
+      },
+      // 删除状态字典翻译
+      delFlagFormat(row, column) {
+        return this.selectDictLabel(this.delFlagOptions, row.delFlag);
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          fId: null,
+          fTypeid: null,
+          fNo: null,
+          fCname: null,
+          fName: null,
+          fEname: null,
+          fTel: null,
+          fFax: null,
+          fEmail: null,
+          fManage: null,
+          fAddr: null,
+          fEaddr: null,
+          fScale: null,
+          fProvince: null,
+          fCity: null,
+          fStltypeid: null,
+          fStldays: null,
+          fContractno: null,
+          fContractb: null,
+          fContracte: null,
+          fTax: null,
+          fInvtel: null,
+          fInvaddr: null,
+          fBankno: null,
+          fBankname: null,
+          fUbankno: null,
+          fUbankname: null,
+          fStatus: "0",
+          delFlag: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null,
+          remark: 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
+        getCorps(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) {
+              updateCorps(this.form).then(response => {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addCorps(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 delCorps(fIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        const queryParams = this.queryParams;
+        this.$confirm('是否确认导出所有客户详情数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportCorps(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+      }
+    }
+  };
+</script>

+ 428 - 0
src/views/basicdata/goods/index.vue

@@ -0,0 +1,428 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="存储id 显示名称 下拉选择类别,一个商品名称对应一个类别,对应t_goodtype的f_id" prop="fTypeid">
+        <el-input
+          v-model="queryParams.fTypeid"
+          placeholder="请输入存储id 显示名称 下拉选择类别,一个商品名称对应一个类别,对应t_goodtype的f_id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="编号" prop="fNo">
+        <el-input
+          v-model="queryParams.fNo"
+          placeholder="请输入编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="名称" prop="fName">
+        <el-input
+          v-model="queryParams.fName"
+          placeholder="请输入名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="英文名称" prop="fEnam">
+        <el-input
+          v-model="queryParams.fEnam"
+          placeholder="请输入英文名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规格" prop="fSpecs">
+        <el-input
+          v-model="queryParams.fSpecs"
+          placeholder="请输入规格"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="包装规格,20、25、35、50、850,kg" prop="fPackagespecs">
+        <el-input
+          v-model="queryParams.fPackagespecs"
+          placeholder="请输入包装规格,20、25、35、50、850,kg"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="颜色" prop="fColor">
+        <el-input
+          v-model="queryParams.fColor"
+          placeholder="请输入颜色"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="海关编码" prop="fHscode">
+        <el-input
+          v-model="queryParams.fHscode"
+          placeholder="请输入海关编码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="包装类型,存储id 显示名称 下拉选择类型,一个商品名称对应一个包装类型,对应t_package的f_id" prop="fPackageid">
+        <el-input
+          v-model="queryParams.fPackageid"
+          placeholder="请输入包装类型,存储id 显示名称 下拉选择类型,一个商品名称对应一个包装类型,对应t_package的f_id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="fStatus">
+        <el-select v-model="queryParams.fStatus" 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="['basicdata:goods: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="['basicdata:goods: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="['basicdata:goods:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['basicdata:goods:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="状态" align="center" prop="fId" />
+      <el-table-column label="存储id 显示名称 下拉选择类别,一个商品名称对应一个类别,对应t_goodtype的f_id" align="center" prop="fTypeid" />
+      <el-table-column label="编号" align="center" prop="fNo" />
+      <el-table-column label="名称" align="center" prop="fName" />
+      <el-table-column label="英文名称" align="center" prop="fEnam" />
+      <el-table-column label="规格" align="center" prop="fSpecs" />
+      <el-table-column label="包装规格,20、25、35、50、850,kg" align="center" prop="fPackagespecs" />
+      <el-table-column label="颜色" align="center" prop="fColor" />
+      <el-table-column label="海关编码" align="center" prop="fHscode" />
+      <el-table-column label="包装类型,存储id 显示名称 下拉选择类型,一个商品名称对应一个包装类型,对应t_package的f_id" align="center" prop="fPackageid" />
+      <el-table-column label="状态" align="center" prop="fStatus" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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="['basicdata:goods:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['basicdata:goods: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="存储id 显示名称 下拉选择类别,一个商品名称对应一个类别,对应t_goodtype的f_id" prop="fTypeid">
+          <el-input v-model="form.fTypeid" placeholder="请输入存储id 显示名称 下拉选择类别,一个商品名称对应一个类别,对应t_goodtype的f_id" />
+        </el-form-item>
+        <el-form-item label="编号" prop="fNo">
+          <el-input v-model="form.fNo" placeholder="请输入编号" />
+        </el-form-item>
+        <el-form-item label="名称" prop="fName">
+          <el-input v-model="form.fName" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="英文名称" prop="fEnam">
+          <el-input v-model="form.fEnam" placeholder="请输入英文名称" />
+        </el-form-item>
+        <el-form-item label="规格" prop="fSpecs">
+          <el-input v-model="form.fSpecs" placeholder="请输入规格" />
+        </el-form-item>
+        <el-form-item label="包装规格,20、25、35、50、850,kg" prop="fPackagespecs">
+          <el-input v-model="form.fPackagespecs" placeholder="请输入包装规格,20、25、35、50、850,kg" />
+        </el-form-item>
+        <el-form-item label="颜色" prop="fColor">
+          <el-input v-model="form.fColor" placeholder="请输入颜色" />
+        </el-form-item>
+        <el-form-item label="海关编码" prop="fHscode">
+          <el-input v-model="form.fHscode" placeholder="请输入海关编码" />
+        </el-form-item>
+        <el-form-item label="包装类型,存储id 显示名称 下拉选择类型,一个商品名称对应一个包装类型,对应t_package的f_id" prop="fPackageid">
+          <el-input v-model="form.fPackageid" placeholder="请输入包装类型,存储id 显示名称 下拉选择类型,一个商品名称对应一个包装类型,对应t_package的f_id" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.fStatus">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="删除状态" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </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 { listGoods, getGoods, delGoods, addGoods, updateGoods, exportGoods } from "@/api/basicdata/goods";
+
+export default {
+  name: "Goods",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 商品详情表格数据
+      goodsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 备注字典
+      fIdOptions: [],
+      // 删除状态字典
+      delFlagOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fTypeid: null,
+        fNo: null,
+        fName: null,
+        fEnam: null,
+        fSpecs: null,
+        fPackagespecs: null,
+        fColor: null,
+        fHscode: null,
+        fPackageid: null,
+        fStatus: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        fTypeid: [
+          { required: true, message: "存储id 显示名称 下拉选择类别,一个商品名称对应一个类别,对应t_goodtype的f_id不能为空", trigger: "blur" }
+        ],
+        fNo: [
+          { required: true, message: "编号不能为空", trigger: "blur" }
+        ],
+        fName: [
+          { required: true, message: "名称不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("data_customer_category").then(response => {
+      this.fIdOptions = response.data;
+    });
+    this.getDicts("data_delete_state").then(response => {
+      this.delFlagOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询商品详情列表 */
+    getList() {
+      this.loading = true;
+      listGoods(this.queryParams).then(response => {
+        this.goodsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 名称字典翻译
+    fIdFormat(row, column) {
+      return this.selectDictLabel(this.fIdOptions, row.fId);
+    },
+    // 删除状态字典翻译
+    delFlagFormat(row, column) {
+      return this.selectDictLabel(this.delFlagOptions, row.delFlag);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fId: null,
+        fTypeid: null,
+        fNo: null,
+        fName: null,
+        fEnam: null,
+        fSpecs: null,
+        fPackagespecs: null,
+        fColor: null,
+        fHscode: null,
+        fPackageid: null,
+        fStatus: "0",
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: 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
+      getGoods(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) {
+            updateGoods(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGoods(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 delGoods(fIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有商品详情数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportGoods(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>

+ 1 - 1
src/views/system/role/index.vue

@@ -592,4 +592,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 2 - 1
vue.config.js

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