Merge remote-tracking branch 'origin/dev' into dev

src/api/basicData/customerInformation.js

@@ -179,3 +179,12 @@ export function creatingUsersTwo(data) {
     data: data
   })
 }
+
+// 客户id查找客户联系人list
+
+export function getById(id) {
+  return request({
+    url: '/api/blade-client/corpsattn/list/' + id,
+    method: 'get'
+  })
+}

src/api/school/productmockstation.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/productmockrecords/productmockstation/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/productmockrecords/productmockstation/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/productmockrecords/productmockstation/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/productmockrecords/productmockstation/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/productmockrecords/productmockstation/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/api/school/records.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-school/records/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/blade-school/records/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/blade-school/records/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/blade-school/records/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/blade-school/records/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/api/school/station.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade.school/station/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/blade.school/station/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/blade.school/station/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/blade.school/station/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/blade.school/station/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/components/warehousKH/main.vue

@@ -54,6 +54,7 @@
 import option from "./configuration/mainList.json";
 import { customerList, allCropList, getDeptLazyTree } from "@/api/basicData/customerInformation";
 import { getCustomerCode, getCustomerName } from "@/enums/management-type";
+import { getById } from "@/api/basicData/customerInformation";
 import { kMaxLength } from "buffer";
 export default {
     name: "main",
@@ -105,6 +106,7 @@ export default {
         treeType: String,
         label: String,
         belongtocompany: Number,
+        source: String
     },
     model: {
         prop: "value",
@@ -227,7 +229,19 @@ export default {
                 if (row) {
                     let res = this.corpList.find(e => { return e.cname == row })
                     if (res) {
+                      if (this.source === '销售机会') {
+                        getById(res.id).then(R => {
+                          console.log(R)
+                          let data = {
+                            'contacts' : R.data.data.cname,
+                            'tel': R.data.data.tel,
+                            'id': res.id
+                          };
+                          this.$emit('getCropId', data)
+                        })
+                      } else {
                         this.$emit('getCropId', res.id)
+                      }
                     } else {
                         this.$emit('getCropId', null)
                     }

src/views/productionManagement/records/index.vue

@@ -0,0 +1,329 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.records_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+      <template slot-scope="scope" slot="menu">
+        <el-button type="text"
+                   size="small"
+                   icon="el-icon-document-copy"
+                   class="none-border"
+                   @click.stop="seeDetails(scope.row.id)">查看
+        </el-button>
+      </template>
+    </avue-crud>
+
+
+    <el-dialog
+      title="查看"
+      :visible.sync="dialogVisible"
+      width="80%"
+      :modal-append-to-body="false">
+
+      <el-form ref="form" disabled :model="dialogForm" :rules="rules" label-width="80px">
+        <el-form-item label="团队名字" style="width: 40%" prop="roleName">
+          <el-input v-model="dialogForm.teamName" placeholder="请输入角色名称"/>
+        </el-form-item>
+      </el-form>
+
+      <el-table
+        :data="dialogForm.productMockStationDTOList"
+        style="width: 100%"
+        :row-class-name="tableRowClassName">
+        <el-table-column
+          prop="data"
+          label="星期">
+        </el-table-column>
+        <el-table-column
+          prop="locationint"
+          label="位置">
+        </el-table-column>
+        <el-table-column
+          prop="productQuantity"
+          label="生产数量">
+        </el-table-column>
+        <el-table-column
+          prop="saleUnitPrice"
+          label="出售单价">
+        </el-table-column>
+        <el-table-column
+          prop="totalAmounts"
+          label="出售总价">
+        </el-table-column>
+      </el-table>
+
+
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false">关 闭</el-button>
+      </span>
+    </el-dialog>
+
+
+  </basic-container>
+</template>
+
+<script>
+import {getList, getDetail, add, update, remove} from "@/api/school/productmockrecords";
+import {mapGetters} from "vuex";
+
+export default {
+  data() {
+    return {
+      // 对话框是否可见
+      dialogVisible: false,
+      // 弹窗数据
+      dialogForm: {},
+      form: {},
+      query: {},
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      selectionList: [],
+      option: {
+        height: 'auto',
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        selection: true,
+        // viewBtn: true,
+        dialogClickModal: false,
+        column: [
+          {
+            label: "系统编号",
+            prop: "sysNo",
+            rules: [{
+              required: true,
+              message: "请输入系统编号",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "团队名字",
+            prop: "teamName",
+            rules: [{
+              required: true,
+              message: "请输入团队名字",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "创建人",
+            prop: "createUser",
+            rules: [{
+              required: true,
+              message: "请输入创建人",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "创建部门",
+            prop: "createDept",
+            rules: [{
+              required: true,
+              message: "请输入创建部门",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "创建时间",
+            prop: "createTime",
+            rules: [{
+              required: true,
+              message: "请输入创建时间",
+              trigger: "blur"
+            }]
+          }
+        ]
+      },
+      data: []
+    };
+  },
+  created() {
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.records_add, false),
+        viewBtn: this.vaildData(this.permission.records_view, false),
+        delBtn: this.vaildData(this.permission.records_delete, false),
+        editBtn: this.vaildData(this.permission.records_edit, false)
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    // 查看详情
+    seeDetails(id) {
+      getDetail(id).then(res => {
+        this.dialogForm = res.data.data;
+        this.dialogVisible = true;
+      });
+    },
+    // 弹窗表格颜色
+    tableRowClassName({row, rowIndex}) {
+      if (rowIndex === 0 || rowIndex === 6 || rowIndex === 12) {
+        return 'warning-row';
+      } else if (rowIndex === 3 || rowIndex === 9) {
+        return 'success-row';
+      }
+      return '';
+    },
+    rowSave(row, done, loading) {
+      add(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        window.console.log(error);
+      });
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        console.log(error);
+      });
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    }
+  }
+};
+</script>
+
+<style>
+.el-table .warning-row {
+  background: oldlace;
+}
+
+.el-table .success-row {
+  background: #f0f9eb;
+}
+</style>

src/views/productionManagement/station/index.vue

@@ -0,0 +1,245 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.station_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import {getList, getDetail, add, update, remove} from "@/api/school/station";
+import {mapGetters} from "vuex";
+
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      selectionList: [],
+      option: {
+        height:'auto',
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        viewBtn: true,
+        selection: true,
+        dialogClickModal: false,
+        column: [
+          {
+            label: "",
+            prop: "id",
+            rules: [{
+              required: true,
+              message: "请输入",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "生产数量",
+            prop: "productQuantity",
+            rules: [{
+              required: true,
+              message: "请输入生产数量",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "出售单价",
+            prop: "saleUnitPrice",
+            rules: [{
+              required: true,
+              message: "请输入出售单价",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "坐标",
+            prop: "locationint",
+            rules: [{
+              required: true,
+              message: "请输入坐标",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "生产日期",
+            prop: "data",
+            rules: [{
+              required: true,
+              message: "请输入生产日期",
+              trigger: "blur"
+            }]
+          },
+        ]
+      },
+      data: []
+    };
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.station_add, false),
+        viewBtn: this.vaildData(this.permission.station_view, false),
+        delBtn: this.vaildData(this.permission.station_delete, false),
+        editBtn: this.vaildData(this.permission.station_edit, false)
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      add(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        window.console.log(error);
+      });
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        console.log(error);
+      });
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage){
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize){
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    }
+  }
+};
+</script>
+
+<style>
+</style>

src/views/saleLeads/detail.vue

@@ -39,7 +39,7 @@
             <span style="color: #409EFF;cursor: pointer" @click.stop="khEdit">客户名称:</span>
           </template>
           <template slot-scope="{row,index}" slot="corpName">
-            <warehous-Kh v-model="form.corpName" :zhKey="true" :disabled="disabled || approvalStatus"
+            <warehous-Kh v-model="form.corpName" :zhKey="true" :disabled="disabled || approvalStatus" source="销售机会"
               @getCropId="getCropId"></warehous-Kh>
           </template>
           <template slot="fromUser">
@@ -103,6 +103,7 @@
             <el-switch v-model="row.approval" :disabled="!row.$cellEdit" :inactive-value="0" :active-value="1">
             </el-switch>
           </template>
+
         </avue-crud>
       </trade-card>
       <el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"
@@ -287,6 +288,7 @@ export default {
                 trigger: "change"
               }
             ],
+            value: 0
           },
           {
             label: "备注",
@@ -518,7 +520,11 @@ export default {
 
     },
     getCropId(row) {
-      this.form.corpId = row
+      console.log(row)
+        this.form.corpId = row.id;
+        this.form.contacts = row.contacts;
+        this.form.tel = row.tel;
+        console.log(this.form)
     },
     //修改提交触发
     editCustomer(status) {
@@ -588,6 +594,7 @@ export default {
             bizUserName: this.loginUser,
             bizUser: this.loginUserId,
             $cellEdit: true,
+            approval: 1,
           })
         }
       })

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

@@ -37,7 +37,8 @@
       "search": true,
       "index": 2,
       "width": 180,
-      "overHidden": true
+      "overHidden": true,
+      "align": "left"
     },
     {
       "label": "应收金额",

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

@@ -273,8 +273,18 @@
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false">
       <el-form :model="accountFormData" ref="accountFormData">
         <el-form-item label="账户名称" class="landConFrom-input" prop="accountName" :rules="rules">
-          <el-input v-model="accountFormData.accountName" style="width: 220px;" size="small" clearable
-            placeholder="请输入"></el-input>
+<!--          <el-input v-model="accountFormData.accountName" style="width: 220px;" size="small" clearable-->
+<!--            placeholder="请输入"></el-input>-->
+
+          <el-select v-model="accountFormData.accountName" style="width: 220px;" size="small" placeholder="请选择">
+            <el-option
+              v-for="item in primaryServiceAccountTitle"
+              :key="item.dictKey"
+              :label="item.dictValue"
+              :value="item.dictKey">
+            </el-option>
+          </el-select>
+
         </el-form-item>
         <el-form-item label="结算日期" class="landConFrom-input" prop="payTime" :rules="rules">
           <el-date-picker type="date" v-model="accountFormData.payTime" value-format="yyyy-MM-dd HH:mm:ss" size="small"
@@ -318,6 +328,11 @@ import { getDeptLazyTree } from "@/api/system/dept";
 import {corpsbank, projectFiles} from "@/api/basicData/configuration"
 //事务
 import examineApprove from "@/components/examineApprove/index";
+
+// 字典
+import { getWorkDicts } from "@/api/system/dictbiz";
+
+
 //对象数组比较
 import { contrastObj, contrastList2 } from "@/util/contrastData";
 import _ from "lodash";
@@ -341,6 +356,8 @@ export default {
   },
   data() {
     return {
+      // 客户名称字典
+      primaryServiceAccountTitle: [],
       pgList: [],
       pgDialog: false,
       goodsDescList: [],
@@ -988,7 +1005,10 @@ export default {
     beforeCloseAccount(row) {
       if (this.verificationData()) {
         this.account = row;
-        this.accountDialog = true;
+        getWorkDicts("primary_service_account_title").then(res => {
+          this.primaryServiceAccountTitle = res.data.data;
+          this.accountDialog = true;
+        })
       }
     },
     dispatch(row, index) {