修改bug

src/api/basicData/facultyManagement.js

@@ -0,0 +1,36 @@
+import request from '@/router/axios';
+export const getList = (current, size, params) => {
+  return request({
+      url: '/api/blade-client/schoolteacher/list',
+      method: 'get',
+      params: {
+          ...params,
+          current,
+          size
+      }
+  })
+}
+export function detail(id) {
+  return request({
+    url: '/api/blade-client/schoolteacher/detail?id=' + id,
+    method: 'get'
+  })
+}
+//修改和新增
+export function submit(data) {
+  return request({
+    url: '/api/blade-client/schoolteacher/submit',
+    method: 'post',
+    data: data
+  })
+}
+//主表删除
+export function remove(data) {
+  return request({
+    url: '/api/blade-client/schoolteacher/remove',
+    method: 'post',
+    params: {
+      ids: data
+    }
+  })
+}

src/api/basicData/portinformation.js

@@ -48,7 +48,13 @@ export const getList = (current, size, params,typeId) => {
     }
   })
 }
-
+//港口列表
+export const getAllList = () => {
+  return request({
+    url: '/api/blade-client/port/portList',
+    method: 'get',
+  })
+}
 export const add = (row) => {
   return request({
     url: '/api/blade-client/port/add',

src/api/salaryManagement/primarySchool.js

@@ -0,0 +1,47 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-school/salary/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size
+    }
+  })
+}
+export function detail(id) {
+  return request({
+    url: '/api/blade-school/salary/detail?id=' + id,
+    method: 'get'
+  })
+}
+//修改和新增
+export function submit(data) {
+  return request({
+    url: '/api/blade-school/salary/submit',
+    method: 'post',
+    data: data
+  })
+}
+//主表删除
+export function remove(data) {
+  return request({
+    url: '/api/blade-school/salary/remove',
+    method: 'post',
+    params: {
+      ids: data
+    }
+  })
+}
+//明细表删除
+export function delItem(data) {
+  return request({
+    url: '/api/blade-school/salaryitem/remove',
+    method: 'post',
+    params: {
+      ids: data
+    }
+  })
+}

src/components/part-dialog/configuration/mainList.json

@@ -21,6 +21,11 @@
       "width": 200
     },
     {
+      "label": "英文名称",
+      "prop": "ename",
+      "width": 200
+    },
+    {
       "label": "供应商",
       "prop": "corpId",
       "width": 200

src/components/part-dialog/main.vue

@@ -205,7 +205,6 @@ export default {
     },
     librayToPart(rows, partreData) {
       this.partreData = partreData;
-      console.log(this.partreData);
       if (this.partreData) {
         rows.forEach(e => {
           this.data.forEach((item, index) => {
@@ -216,6 +215,7 @@ export default {
               item.corpId = e.corpId;
               item.corpName = e.corpName;
               item.goodName = e.cname;
+              item.ename = e.ename;
               item.price = e.purchaseAmount;
               item.goodNumber = this.partreData.goodNumber;
               item.amout = _.multiply(
@@ -234,6 +234,7 @@ export default {
             goodId: e.itemId,
             goodTypeId: e.goodTypeId,
             goodTypeName: e.goodsTypeName,
+            ename:e.ename,
             corpId: e.corpId,
             corpName: e.corpName,
             goodName: e.cname,

src/components/port-info/configuration/mainList.json

@@ -4,10 +4,11 @@
   "index": true,
   "tree": true,
   "addBtn": false,
-  "menu":false,
-  "selection":true,
-  "tip":false,
-  "header":false,
+  "menu": false,
+  "selection": true,
+  "tip": false,
+  "header": false,
+  "searchMenuSpan": 8,
   "column": [{
       "label": "港口编号",
       "prop": "code",
@@ -16,11 +17,15 @@
     {
       "label": "港口名称",
       "prop": "name",
+      "search": true,
+      "searchSpan": 8,
       "width": 150
     },
     {
       "label": "英文全称",
       "prop": "enName",
+      "search": true,
+      "searchSpan": 8,
       "width": 150
     },
     {

src/components/port-info/index.vue

@@ -94,7 +94,8 @@ import {
   update,
   remove,
   getPortTypeTree,
-  getTypeTree
+  getTypeTree,
+  getAllList
 } from "@/api/basicData/portinformation";
 
 export default {
@@ -153,8 +154,8 @@ export default {
     event: "balabala"
   },
   created() {
-    getList().then(res => {
-      this.portList = res.data.data.records;
+    getAllList().then(res => {
+      this.portList = res.data.data;
     });
   },
   components: {
@@ -227,7 +228,7 @@ export default {
     },
     currentChange(val) {
       this.page.currentPage = val;
-      this.getList();
+      this.getList(this.page);
     },
     refreshChange() {
       this.getList(this.page, this.search);

src/components/price-Library/configuration/mainList.json

@@ -11,8 +11,7 @@
   "menuWidth": "180",
   "selection": true,
   "tip": false,
-  "column": [
-    {
+  "column": [{
       "label": "商品编号",
       "prop": "code",
       "index": 1,
@@ -45,6 +44,15 @@
       "overHidden": true
     },
     {
+      "label": "英文名称",
+      "search": true,
+      "searchSpan": 8,
+      "prop": "ename",
+      "index": 3,
+      "width": 100,
+      "overHidden": true
+    },
+    {
       "label": "采购价格",
       "prop": "purchaseAmount",
       "index": 4,

src/views/basicData/customerInformation/index.vue

@@ -236,7 +236,6 @@ export default {
       loading = true;
     },
     uploadAfter(res, done, loading, column) {
-      window.console.log(column);
       this.excelBox = false;
       this.$message.success("导入成功！");
       this.refreshChange();

src/views/basicData/facultyManagement/detailsPage.vue

@@ -0,0 +1,535 @@
+<template>
+  <div>
+    <div class="borderless">
+      <div class="customer-head">
+        <div class="customer-back">
+          <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"
+          size="small"
+          @click="editCustomer"
+          >保存数据
+        </el-button>
+      </div>
+      <containerTitle
+        title="基础资料"
+        style="margin-top: 60px"
+      ></containerTitle>
+      <basic-container>
+        <el-row>
+          <el-col :span="18">
+            <avue-form
+              ref="form"
+              class="trading-form"
+              v-model="form"
+              :option="option"
+            />
+          </el-col>
+          <el-col :span="6">
+            <avue-form class="img-form" :option="option4" v-model="form" />
+          </el-col>
+        </el-row>
+        <avue-form
+          ref="form"
+          class="trading-form"
+          v-model="form"
+          :option="option2"
+        />
+      </basic-container>
+      <containerTitle title="详细信息"></containerTitle>
+      <basic-container>
+        <avue-form
+          ref="form"
+          class="trading-form"
+          v-model="form"
+          :option="option3"
+        />
+      </basic-container>
+    </div>
+  </div>
+</template>
+
+<script>
+import { detail, submit } from "@/api/basicData/facultyManagement";
+export default {
+  name: "index",
+  data() {
+    return {
+      form: {},
+      option: {
+        menuBtn: false,
+        labelWidth: 100,
+        column: [
+          {
+            label: "姓名",
+            prop: "cname",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
+            span: 8
+          },
+          {
+            label: "工号",
+            prop: "code",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
+            span: 8
+          },
+          {
+            label: "曾用名",
+            prop: "usedName",
+            span: 8
+          },
+          {
+            label: "性别",
+            prop: "gender",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=sex",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 8
+          },
+          {
+            label: "籍贯",
+            prop: "nativePlace",
+            span: 8
+          },
+          {
+            label: "民族",
+            prop: "nation",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=nationa_lity",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 8
+          },
+          {
+            label: "身份证",
+            prop: "idNumber",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
+            span: 8
+          },
+          {
+            label: "出生日期",
+            prop: "birthdate",
+            type: "date",
+            valueFormat: "yyyy-MM-dd",
+            span: 8
+          },
+          {
+            label: "婚姻状况",
+            prop: "maritalStatus",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=marital_status",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 8
+          },
+          {
+            label: "政治面貌",
+            prop: "politicsStatus",
+            type: "select",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=politics_status",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 8
+          },
+          {
+            label: "加入日期",
+            prop: "joiningDate",
+            type: "date",
+            valueFormat: "yyyy-MM-dd",
+            span: 8
+          },
+          {
+            label: "健康状况",
+            prop: "healthCondition",
+            type: "select",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=health_condition",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 8
+          }
+        ]
+      },
+      option2: {
+        menuBtn: false,
+        labelWidth: 100,
+        column: [
+          {
+            label: "血型",
+            prop: "bloodType",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=blood_type",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "家庭住址",
+            prop: "familyAddress",
+            span: 6
+          },
+          {
+            label: "邮政编码",
+            prop: "postalCode",
+            span: 6
+          },
+          {
+            label: "户口性质",
+            prop: "category",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=category",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "户口所在地",
+            prop: "residentCity",
+            span: 6
+          },
+          {
+            label: "联系电话",
+            prop: "phone",
+            span: 6
+          },
+          {
+            label: "电子邮箱",
+            prop: "emailAddress",
+            span: 6
+          },
+          {
+            label: "宗教信仰",
+            prop: "faith",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=faith",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "紧急联系人",
+            prop: "contacts",
+            span: 6
+          },
+          {
+            label: "紧急联系人电话",
+            prop: "contactNumber",
+            span: 6
+          },
+          {
+            label: "国别",
+            prop: "nationnality",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=nationnality",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "港澳台侨",
+            prop: "indentation",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=TF_status",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          }
+        ]
+      },
+      option3: {
+        menuBtn: false,
+        labelWidth: 100,
+        column: [
+          {
+            label: "编制类别",
+            prop: "compileCategory",
+            type: "select",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=compile_category",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "身份类别",
+            prop: "identityCategory",
+            type: "select",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=identity_category",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "教师类别",
+            prop: "teacherCategory",
+            type: "select",
+            dataType: "string",
+            multiple: true,
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=teacher_category",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "工作状态",
+            prop: "workingCondition",
+            type: "select",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=working_condition",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "现工作单位",
+            prop: "currentEmployer",
+            span: 12
+          },
+          {
+            label: "所在校区",
+            prop: "inCampus",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=in_campus",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
+            span: 6
+          },
+          {
+            label: "所在部门",
+            prop: "inSection",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=in_section",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
+            span: 6
+          },
+          {
+            label: "所在院系",
+            prop: "department",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=department",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "所在教研室",
+            prop: "inStaffRoom",
+            type: "select",
+            dataType: "string",
+            multiple: true,
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=in_staff_room",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6,
+            row: true
+          },
+          {
+            label: "双师",
+            prop: "doubleTeachers",
+            type: "radio",
+            dataType: "string",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=TF_status",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "专业带头人",
+            prop: "professionalLeader",
+            type: "radio",
+            dataType: "string",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=TF_status",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "骨干教师",
+            prop: "coreTeacher",
+            type: "radio",
+            dataType: "string",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=TF_status",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6,
+            row: true
+          },
+          {
+            label: "专业特长",
+            prop: "professionalExpertise",
+            type: "textarea",
+            span: 24
+          }
+        ]
+      },
+      option4: {
+        menuBtn: false,
+        labelWidth: 100,
+        column: [
+          {
+            label: "个人头像",
+            prop: "headPortrait",
+            type: "upload",
+            listType: "picture-img",
+            dataType: "string",
+            action: "/api/blade-resource/oss/endpoint/put-file",
+            propsHttp: {
+              res: "data",
+              url: "link"
+            }
+          }
+        ]
+      }
+    };
+  },
+  props: {
+    detailData: {
+      type: Object
+    }
+  },
+  created() {
+    if (this.detailData.id) {
+      this.getDetail(this.detailData.id);
+    }
+  },
+  methods: {
+    getDetail(id) {
+      detail(id)
+        .then(res => {
+          this.form = res.data.data;
+        })
+        .finally(() => {
+          // this.loading = false;
+          // this.showBut = true;
+          // this.pageLoading = false;
+        });
+    },
+    //修改提交触发
+    editCustomer() {
+      this.$refs["form"].validate((valid, done) => {
+        done();
+        if (valid) {
+          submit({ ...this.form })
+            .then(res => {
+              this.$message.success("保存成功");
+              this.form = res.data.data;
+            })
+            .finally(() => {});
+        } else {
+          return false;
+        }
+      });
+    },
+    //返回列表
+    backToList() {
+      this.$emit("goBack");
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.trading-form ::v-deep .el-form-item {
+  margin-bottom: 8px !important;
+}
+::v-deep .el-form-item__error {
+  display: none !important;
+}
+.img-form ::v-deep .el-form-item {
+  height: 150px;
+  line-height: 150px;
+  margin-bottom: 8px !important;
+}
+.img-form ::v-deep .avue-upload__icon {
+  font-size: 20px;
+  width: 150px;
+  height: 150px;
+  line-height: 150px;
+}
+</style>

src/views/basicData/facultyManagement/index.vue

@@ -1,118 +1,272 @@
 <template>
   <div>
-    <basic-container
-        v-if="show">
-    <avue-crud
+    <basic-container v-if="show">
+      <avue-crud
+        ref="crud"
         :option="option"
+        :data="dataList"
         :before-open="beforeOpen"
-    ></avue-crud>
-
-    </basic-container>
-    <div v-else class="borderless">
-      <div class="customer-head">
-        <div class="customer-back">
-          <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
-                     @click="backToList">返回列表
+        :page.sync="page"
+        :search.sync="search"
+        @search-change="searchChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
+        @on-load="onLoad"
+        :table-loading="loading"
+        @saveColumn="saveColumn"
+        :cell-style="cellStyle"
+      >
+        <template slot="menuLeft">
+          <el-button
+            type="primary"
+            size="small"
+            icon="el-icon-bottom"
+            @click="excelBox = true"
+            >导入
           </el-button>
-        </div>
-        <el-button
-            class="el-button--small-yh add-customer-btn"
+          <el-button
             type="primary"
-            :disabled="disabled"
             size="small"
-            @click="editCustomer"
-        >{{ form.id ? '确认修改' : '确认新增' }}
-        </el-button>
-      </div>
-      <containerTitle title="基础资料" style="margin-top: 60px"></containerTitle>
-      <basic-container>
-        <img src="https://trade.tubaosoft.com/file/bladex/000000/1123598821738675201/图层2.png" alt="" style="width: 100%;">
-      </basic-container>
-      <containerTitle title="详细信息"></containerTitle>
-      <basic-container>
-        <img src="https://trade.tubaosoft.com/file/bladex/000000/1123598821738675201/图层3.png" alt="" style="width: 100%;">
-      </basic-container>
-    </div>
+            icon="el-icon-bottom"
+            @click.stop="openExport()"
+            >导出
+          </el-button>
+        </template>
+        <template slot-scope="{ row, index }" slot="menu">
+          <el-button type="text" size="small" @click.stop="editOpen(row)">
+            编辑
+          </el-button>
+          <el-button type="text" size="small" @click.stop="rowDel(row, index)">
+            删除
+          </el-button>
+        </template>
+      </avue-crud>
+      <el-dialog
+        title="导入教职工资料"
+        append-to-body
+        :visible.sync="excelBox"
+        width="555px"
+        v-dialog-drag
+      >
+        <avue-form
+          :option="excelOption"
+          v-model="excelForm"
+          table-loading="excelLoading"
+          :upload-after="uploadAfter"
+        >
+          <template slot="excelTemplate">
+            <el-button type="primary" @click="derivation">
+              点击下载<i class="el-icon-download el-icon--right"></i>
+            </el-button>
+          </template>
+        </avue-form>
+        <p style="text-align: center;color: #DC0505">
+          温馨提示 第一次导入时请先下载模板
+        </p>
+      </el-dialog>
+    </basic-container>
+    <details-page v-else @goBack="backToList" :detailData="detailData" />
   </div>
 </template>
 
 <script>
+import detailsPage from "./detailsPage";
+import { getToken } from "@/util/auth";
+import { getList, remove } from "@/api/basicData/facultyManagement";
 export default {
   name: "index",
-  data(){
+  data() {
     return {
-      show:true,
-      form:{},
-      option:{
-        lazy: true,
-        tip: false,
-        simplePage: true,
+      show: true,
+      loading: false,
+      form: {},
+      search: {},
+      detailData: {},
+      dataList: [],
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 50, 100, 200, 300, 400, 500]
+      },
+      option: {
         searchShow: true,
-        searchMenuSpan: 24,
-        dialogWidth: "60%",
+        searchMenuSpan: 16,
         align: "center",
         searchSpan: 8,
-        searchMenuPosition: "right",
-        tree: true,
         border: true,
         index: true,
-        selection: true,
         viewBtn: false,
         editBtn: false,
         delBtn: false,
-        menuWidth: 180,
+        menuWidth: 100,
         dialogClickModal: false,
         searchLabelWidth: 100,
         searchIcon: true,
         searchIndex: 2,
         addBtnText: "新单",
-        expand: true,
-        expandWidth: 38,
-        selectionWidth: 40,
-        column:[
+        column: [
           {
-            label:'工号',
-            prop:'name',
-            search:true,
+            label: "工号",
+            prop: "code",
+            search: true,
             span: 8,
-            maxlength: 3,
+            maxlength: 3
           },
           {
-            label:'姓名',
-            prop:'name1',
-            search:true,
+            label: "姓名",
+            prop: "cname",
+            search: true,
             span: 8,
-            maxlength: 3,
+            maxlength: 3
           },
           {
-            label:'身份类别',
-            prop:'name1',
-            search:true,
+            label: "身份类别",
+            prop: "identityCategory",
+            search: true,
+            type: "select",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=identity_category",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
             span: 8,
-            maxlength: 3,
+            maxlength: 3
           },
           {
-            label:'教师类别',
-            prop:'name1',
-            search:true,
+            label: "教师类别",
+            prop: "teacherCategory",
+            search: true,
+            type: "select",
+            dataType: "string",
+            multiple: true,
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=teacher_category",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
             span: 8,
-            maxlength: 3,
-          }]
+            maxlength: 3
+          }
+        ]
+      },
+      excelBox: false,
+      excelLoading: false,
+      excelForm: {},
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: "模板下载",
+            prop: "excelTemplate",
+            formslot: true,
+            span: 24
+          },
+          {
+            label: "模板上传",
+            prop: "excelFile",
+            type: "upload",
+            drag: true,
+            loadText: "模板上传中，请稍等",
+            span: 24,
+            propsHttp: {
+              res: "data"
+            },
+            tip: "请上传 .xls,.xlsx 标准格式文件",
+            action: "/api/blade-client/schoolteacher/import"
+          }
+        ]
       }
-    }
+    };
+  },
+  components: {
+    detailsPage
   },
-  methods:{
-    beforeOpen(row, index){
-      this.show = false
+  methods: {
+    derivation() {
+      window.open(
+        `/api/blade-client/schoolteacher/export/template?${
+          this.website.tokenHeader
+        }=${getToken()}`
+      );
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.search);
+    },
+    openExport() {
+      window.open(
+        `/api/blade-client/schoolteacher/export/teacher?${
+          this.website.tokenHeader
+        }=${getToken()}`
+      );
+    },
+    beforeOpen(row, index) {
+      this.show = false;
+    },
+    uploadAfter(res, done, loading) {
+      this.onLoad(this.page, this.search);
+      done();
+    },
+    onLoad(page, params) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, params)
+        .then(res => {
+          this.dataList = res.data.data.records ? res.data.data.records : [];
+          this.page.total = res.data.data.total;
+          if (this.page.total) {
+            this.option.height = window.innerHeight - 350;
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    editOpen(row) {
+      this.detailData = {
+        id: row.id
+      };
+      this.show = false;
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    rowDel(row, index, done) {
+      this.$confirm("确定删除数据?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        remove(row.id).then(res => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+            this.onLoad(this.page, this.search);
+          }
+        });
+      });
     },
     //返回列表
     backToList() {
-      this.show = true
-    },
+      this.show = true;
+    }
   }
-}
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

src/views/exportTrade/customerInquiry/config/customerContact.json

@@ -8,7 +8,7 @@
   "addBtn": false,
   "delBtn": false,
   "align": "center",
-  "menuWidth": 130,
+  "menuWidth": 100,
   "refreshBtn": false,
   "showSummary": true,
   "column": [{
@@ -33,16 +33,23 @@
       "overHidden": true
     },
     {
+      "label": "英文名称",
+      "prop": "ename",
+      "index": 4,
+      "width": 200,
+      "overHidden": true
+    },
+    {
       "label": "产品属性",
       "prop": "itemProp",
-      "index": 4,
+      "index": 5,
       "width": 200,
       "overHidden": true
     },
     {
       "label": "产品描述",
       "prop": "itemDescription",
-      "index": 5,
+      "index": 6,
       "width": 100,
       "overHidden": true,
       "cell": true
@@ -50,20 +57,20 @@
     {
       "label": "产品型号",
       "prop": "itemType",
-      "index": 6,
+      "index": 7,
       "width": 100
     },
     {
       "label": "采购单价",
       "prop": "purchaseAmount",
-      "index": 7,
+      "index": 8,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "配件信息",
       "prop": "partsDescribe",
-      "index": 8,
+      "index": 9,
       "width": 200,
       "overHidden": true
     },

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -271,7 +271,7 @@
               type="text"
               @click="rowDel(row, index)"
               :disabled="detailData.status == 1"
-              >删 除</el-button
+              >删除</el-button
             >
           </template>
           <template slot="itemType" slot-scope="{ row }">
@@ -975,7 +975,7 @@ export default {
       return "padding:0;height:40px;";
     },
     copyDoc() {
-      this.$emit('copyOrder',this.form.id)
+      this.$emit("copyOrder", this.form.id);
     },
     getCorpData(row) {
       this.form.corpAttn = null;
@@ -1188,7 +1188,7 @@ export default {
       const namePrices = [];
       rows.map(e => {
         names.push(e.goodName);
-        namePrices.push(e.goodName + ":" + e.amout);
+        namePrices.push(e.ename + ":" + e.amout);
       });
       this.data[index].partsDescribe = names.join(",");
       this.data[index].partsPriceDescribe = namePrices.join(";");
@@ -1404,6 +1404,7 @@ export default {
                 item.itemId = e.id;
                 item.code = e.code;
                 item.cname = e.cname;
+                item.ename = e.ename;
                 item.corpId = e.corpId;
                 item.corpName = e.corpName;
                 item.priceCategory = e.goodsTypeName;
@@ -1475,6 +1476,7 @@ export default {
             itemId: e.id,
             code: e.code,
             cname: e.cname,
+            ename: e.ename,
             corpId: e.corpId,
             corpName: e.corpName,
             priceCategory: e.goodsTypeName,
@@ -1550,6 +1552,7 @@ export default {
           itemId: e.itemId,
           code: e.code,
           cname: e.cname,
+          ename: e.ename,
           priceCategory: e.goodsTypeName,
           purchaseAmount: e.purchaseAmount,
           itemProp: null,

src/views/exportTrade/customerInquiry/index.vue

@@ -149,7 +149,7 @@ import {
   gainUser,
   getGoodsInfo
 } from "@/api/basicData/customerInquiry";
-import detailPage from "./detailsPage.vue";
+import detailPage from "./detailsPage";
 import { defaultDate } from "@/util/date";
 import { micrometerFormat, IntegerFormat } from "@/util/validate";
 import _ from "lodash";

src/views/exportTrade/salesContract/config/customerContact.json

@@ -35,16 +35,23 @@
       "overHidden": true
     },
     {
+      "label": "英文名称",
+      "prop": "ename",
+      "index": 4,
+      "width": 200,
+      "overHidden": true
+    },
+    {
       "label": "产品属性",
       "prop": "itemProp",
-      "index": 4,
+      "index": 5,
       "width": 200,
       "overHidden": true
     },
     {
       "label": "产品描述",
       "prop": "itemDescription",
-      "index": 5,
+      "index": 6,
       "width": 100,
       "overHidden": true,
       "cell": true
@@ -52,55 +59,55 @@
     {
       "label": "产品型号",
       "prop": "itemType",
-      "index": 6,
+      "index": 7,
       "width": 100
     },
     {
       "label": "采购单价",
       "prop": "purchaseAmount",
-      "index": 7,
+      "index": 8,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "配件信息",
       "prop": "partsDescribe",
-      "index": 8,
+      "index": 9,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "配件价格",
       "prop": "partsPrice",
-      "index": 9,
+      "index": 10,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "配件价格描述",
       "prop": "partsPriceDescribe",
-      "index": 10,
+      "index": 11,
       "width": 120,
       "overHidden": true
     },
     {
       "label": "供应商",
       "prop": "corpId",
-      "index": 11,
+      "index": 12,
       "width": 200,
       "overHidden": true
     },
     {
       "label": "重点推荐",
       "prop": "priorityReferrer",
-      "index": 12,
+      "index": 13,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "推荐理由",
       "prop": "referrerReason",
-      "index": 13,
+      "index": 14,
       "width": 100,
       "overHidden": true,
       "cell": true
@@ -108,21 +115,21 @@
     {
       "label": "销售价",
       "prop": "price",
-      "index": 14,
+      "index": 15,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "单品毛利率",
       "prop": "itemMargin",
-      "index": 15,
+      "index": 16,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "计价单位",
       "prop": "unit",
-      "index": 16,
+      "index": 17,
       "width": 100,
       "overHidden": true,
       "cell": true,
@@ -136,56 +143,56 @@
     {
       "label": "数量",
       "prop": "orderQuantity",
-      "index": 17,
+      "index": 18,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "发货数量",
       "prop": "actualQuantity",
-      "index": 18,
+      "index": 19,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "保险",
       "prop": "insurance",
-      "index": 19,
+      "index": 20,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "运费",
       "prop": "freight",
-      "index": 20,
+      "index": 21,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "折扣",
       "prop": "discount",
-      "index": 21,
+      "index": 22,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "金额",
       "prop": "amount",
-      "index": 22,
+      "index": 23,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "税率",
       "prop": "taxRate",
-      "index": 23,
+      "index": 24,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 24,
+      "index": 25,
       "width": 100,
       "overHidden": true,
       "cell": true

src/views/exportTrade/salesContract/detailsPage.vue

@@ -46,7 +46,9 @@
             <el-dropdown-item @click.native="saveSell"
               >生成采购
             </el-dropdown-item>
-            <el-dropdown-item :disabled="!form.id" @click.native="copyDoc">复制单据</el-dropdown-item>
+            <el-dropdown-item :disabled="!form.id" @click.native="copyDoc"
+              >复制单据</el-dropdown-item
+            >
           </el-dropdown-menu>
         </el-dropdown>
         <el-button
@@ -1245,7 +1247,7 @@ export default {
       const namePrices = [];
       rows.map(e => {
         names.push(e.goodName);
-        namePrices.push(e.goodName + ":" + e.amout);
+        namePrices.push(e.ename + ":" + e.amout);
       });
       this.data[index].partsDescribe = names.join(",");
       this.data[index].partsPriceDescribe = namePrices.join(";");
@@ -1469,6 +1471,7 @@ export default {
                 item.itemId = e.id;
                 item.code = e.code;
                 item.cname = e.cname;
+                item.ename = e.ename;
                 item.corpId = e.corpId;
                 item.corpName = e.corpName;
                 item.priceCategory = e.goodsTypeName;
@@ -1540,6 +1543,7 @@ export default {
             itemId: e.id,
             code: e.code,
             cname: e.cname,
+            ename: e.ename,
             corpId: e.corpId,
             corpName: e.corpName,
             priceCategory: e.goodsTypeName,
@@ -1613,6 +1617,7 @@ export default {
           itemId: e.itemId,
           code: e.code,
           cname: e.cname,
+          ename: e.ename,
           priceCategory: e.goodsTypeName,
           purchaseAmount: e.purchaseAmount,
           itemProp: null,

src/views/salaryManagement/primarySchool/index.vue

@@ -1,148 +1,220 @@
 <template>
   <div>
-    <basic-container
-        v-if="isShow">
+    <basic-container v-if="isShow" class="page-crad">
       <avue-crud
-          :data="dataList"
-          :option="option"
-          :before-open="beforeOpen"
-          v-model="form"
-          :page.sync="page"
+        ref="crud"
+        :option="option"
+        :data="dataList"
+        :before-open="beforeOpen"
+        :page.sync="page"
+        :search.sync="search"
+        @search-change="searchChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
+        @on-load="onLoad"
+        :table-loading="loading"
+        @saveColumn="saveColumn"
+        :cell-style="cellStyle"
       >
+        <template slot-scope="{ row }" slot="updateUser">
+          <span>{{ row.updateUserName }}</span>
+        </template>
+        <template slot-scope="{ row, index }" slot="menu">
+          <el-button type="text" size="small" @click.stop="editOpen(row, 1)">
+            查看
+          </el-button>
+          <el-button type="text" size="small" @click.stop="editOpen(row, 2)">
+            编辑
+          </el-button>
+          <el-button type="text" size="small" @click.stop="rowDel(row, index)">
+            删除
+          </el-button>
+        </template>
       </avue-crud>
     </basic-container>
     <detailPage
-        v-else
-        ref="detail"
-        @goBack="goBack"
-        :detailData="detailData"></detailPage>
+      v-else
+      ref="detail"
+      @goBack="goBack"
+      :detailData="detailData"
+    ></detailPage>
   </div>
 </template>
 
 <script>
 import detailPage from "./detailsPage";
+import { getList, remove } from "@/api/salaryManagement/primarySchool";
 export default {
   name: "index",
   components: {
     detailPage
   },
-  data(){
-    return{
-      form:{},
-      dataList:[],
-      isShow:true,
-      detailData:{},
+  data() {
+    return {
+      form: {},
+      dataList: [],
+      loading: false,
+      isShow: true,
+      detailData: {},
       page: {
         pageSize: 10,
-        pagerCount:1
+        pagerCount: 1
       },
-      option:{
-        "lazy": true,
-        "tip": false,
-        "simplePage": true,
-        "searchShow": true,
-        "searchMenuSpan": 24,
-        "dialogWidth": "60%",
-        "align": "center",
-        "searchSpan": 8,
-        "searchMenuPosition": "right",
-        "tree": true,
-        "border": true,
-        "index": true,
-        "selection": true,
-        "viewBtn": false,
-        "editBtn": false,
-        "delBtn": false,
-        "menuWidth": 180,
-        "dialogClickModal": false,
-        "searchLabelWidth": 100,
-        "searchIcon": true,
-        "searchIndex": 2,
-        "addBtnText": "新单",
-        "expand": true,
-        "expandWidth": 38,
-        "selectionWidth": 40,
-        column:[
+      option: {
+        searchShow: true,
+        searchMenuSpan: 16,
+        align: "center",
+        searchSpan: 8,
+        border: true,
+        index: true,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        menuWidth: 120,
+        searchIcon: true,
+        searchIndex: 2,
+        addBtnText: "新单",
+        column: [
           {
-            label:'年',
-            prop:'name',
-            type:'year',
-            width:100,
-            search:true
+            label: "年",
+            prop: "annual",
+            type: "year",
+            valueFormat: "yyyy",
+            overHidden: true,
+            width: 100,
+            search: true
           },
           {
-            label:'月',
-            prop:'name1',
-            type:'month',
-            width:100,
-            search:true
+            label: "月",
+            prop: "moon",
+            type: "select",
+            filterable: true,
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=month",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
+            overHidden: true,
+            width: 100,
+            search: true
           },
           {
-            label:'制单人',
-            prop:'name2',
-            type:'month',
-            width:100,
-            search:true
+            label: "制单人",
+            prop: "createUser",
+            type: "select",
+            filterable: true,
+            dicUrl: "/api/blade-user/client/gainUser",
+            props: {
+              label: "name",
+              value: "id"
+            },
+            overHidden: true,
+            width: 100,
+            search: true
           },
           {
-            label:'制单日期',
-            prop:'name3',
-            type:'month',
-            width:200,
-            search:true
+            label: "制单日期",
+            prop: "createTime",
+            type: "date",
+            overHidden: true,
+            width: 200
           },
           {
-            label:'更新人',
-            prop:'name4',
-            width:100,
-            type:'month',
-            search:true
+            label: "更新人",
+            prop: "updateUser",
+            overHidden: true,
+            width: 100
           },
           {
-            label:'更新日期',
-            prop:'name5',
-            type:'month',
-            width:200,
-            search:true
+            label: "更新日期",
+            prop: "updateTime",
+            type: "date",
+            overHidden: true,
+            width: 200
           },
           {
-            label:'备注',
-            prop:'name6',
-            search:true
+            label: "备注",
+            prop: "remarks",
+            overHidden: true,
+            search: true
           }
         ]
-
       }
-    }
+    };
   },
-  methods:{
-//查看跳转页面
-    beforeOpenPage(row, index) {
-      this.detailData = {
-        id: row.id,
-      };
-      this.isShow = false;
-    },//新增跳转页面
-    beforeOpen(row, index) {
-      this.detailData = {
-        id: row.id,
-      };
+  methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.search);
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    onLoad(page, params) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, params)
+        .then(res => {
+          this.dataList = res.data.data.records ? res.data.data.records : [];
+          this.page.total = res.data.data.total;
+          if (this.page.total) {
+            this.option.height = window.innerHeight - 350;
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    //新增跳转页面
+    beforeOpen() {
       this.isShow = false;
     },
-    editOpen(row, index) {
+    editOpen(row, status) {
       this.detailData = {
         id: row.id,
+        status: status
       };
       this.isShow = false;
     },
+    rowDel(row, index, done) {
+      this.$confirm("确定删除数据?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        remove(row.id).then(res => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+            this.onLoad(this.page, this.search);
+          }
+        });
+      });
+    },
     goBack() {
-      this.detailData=this.$options.data().detailData
+      this.detailData = this.$options.data().detailData;
       this.isShow = true;
-    },
+    }
   }
-}
+};
 </script>
 
 <style scoped>
-
+.page-crad ::v-deep .basic-container__card {
+  height: 94.2vh;
+}
 </style>

src/views/wel/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="billType">
     <tongjiSchool v-if="billType == 1"></tongjiSchool>
     <defaultPage v-else :sysType='billType'></defaultPage>
   </div>