Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/api/mes/md/clientAccount.js

+import request from '@/utils/request'
+
+// 查询客户付款信息列表
+export function pageAccount(data) {
+  return request({
+    url: '/md/mdClientAccount/page',
+    method: 'post',
+    data
+  })
+}
+
+// 查询客户付款信息列表
+export function listAccount(query) {
+  return request({
+    url: '/md/mdClientAccount/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询客户付款信息详细
+export function getAccount(id) {
+  return request({
+    url: '/md/mdClientAccount/' + id,
+    method: 'get'
+  })
+}
+
+// 新增客户付款信息
+export function addAccount(data) {
+  return request({
+    url: '/md/mdClientAccount',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改客户付款信息
+export function updateAccount(data) {
+  return request({
+    url: '/md/mdClientAccount',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除客户付款信息
+export function delAccount(id) {
+  return request({
+    url: '/md/mdClientAccount/' + id,
+    method: 'delete'
+  })
+}

src/store/modules/order.js

@@ -155,7 +155,7 @@ const order = {
     getSaleShipmentPoint({commit, state}) {
       return new Promise((resolve, reject) => {
         if (state.saleShipmentPoint && state.saleShipmentPoint.length) return resolve(state.saleShipmentPoint)
-        listPaymentClause().then(res => {
+        listPoint().then(res => {
           commit('SET_SALE_SHIPMENT_POINT', res.rows)
           resolve(res.rows)
         }).catch(() => reject())

src/views/mes/md/client/components/Account.vue

+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:account:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['md:account:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['md:account:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:account:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="accountList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="银行账户" align="center" prop="bankAccount"/>
+      <el-table-column label="户名" align="center" prop="accountName"/>
+      <el-table-column label="开户银行" align="center" prop="bank"/>
+      <el-table-column label="是否启用" align="center" prop="enableFlag" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
+        </template>
+      </el-table-column>
+      <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="['md:account:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:account: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="bank">
+          <el-input v-model="form.bank" placeholder="请输入开户银行"/>
+        </el-form-item>
+        <el-form-item label="银行账户" prop="bankAccount">
+          <el-input v-model="form.bankAccount" placeholder="请输入银行账户"/>
+        </el-form-item>
+        <el-form-item label="户名" prop="accountName">
+          <el-input v-model="form.accountName" placeholder="请输入户名"/>
+        </el-form-item>
+        <el-form-item label="是否启用" prop="enableFlag">
+          <el-select
+            v-model="form.enableFlag"
+            placeholder="是否启用"
+            clearable
+            style="width: 215px"
+          >
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addAccount, delAccount, getAccount, pageAccount, updateAccount } from '@/api/mes/md/clientAccount'
+
+export default {
+  name: 'Account',
+  dicts: ['sys_yes_no'],
+  props: {
+    clientId: Number
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 客户付款信息表格数据
+      accountList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        clientId: this.clientId, bank: null, bankAccount: null, accountName: null, enableFlag: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {}
+    }
+  },
+  methods: {
+    /** 查询客户付款信息列表 */
+    getList() {
+      this.loading = true
+      pageAccount(this.queryParams).then(response => {
+        this.accountList = response.data.records
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        clientId: this.clientId,
+        bank: null,
+        bankAccount: null,
+        accountName: null,
+        enableFlag: 'Y',
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加客户付款信息'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getAccount(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改客户付款信息'
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      if (!this.form.clientId) return this.$message.error("请先创建客户")
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAccount(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addAccount(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除客户付款信息编号为"' + ids + '"的数据项？').then(function() {
+        return delAccount(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/account/export', {
+        ...this.queryParams
+      }, `account_${new Date().getTime()}.xlsx`)
+    },
+    init(form) {
+      console.log(form)
+      this.queryParams.clientId = form.clientId
+      this.getList()
+    }
+  }
+}
+</script>

src/views/mes/md/client/index.vue

@@ -245,6 +245,9 @@
           <el-tab-pane label="客户联系人" name="ClientContact">
             <ClientContact ref="ClientContact" :clientId="form.clientId"/>
           </el-tab-pane>
+          <el-tab-pane label="银行账号" name="Account">
+            <Account ref="Account" :clientId="form.clientId"/>
+          </el-tab-pane>
           <el-tab-pane label="产品对照" name="ClientItem">
             <ClientItem ref="ClientItem"/>
           </el-tab-pane>
@@ -275,6 +278,7 @@ import BaseInfo from '@/views/mes/md/client/components/BaseInfo'
 import UrgeEmail from '@/views/mes/md/client/components/UrgeEmail'
 import AddrInfo from '@/views/mes/md/client/components/AddrInfo'
 import ClientContact from '@/views/mes/md/client/components/ClientContact'
+import Account from '@/views/mes/md/client/components/Account'
 import ClientItem from '@/views/mes/md/client/components/ClientItem'
 import DeliveryInfo from '@/views/mes/md/client/components/DeliveryInfo'
 import FinanceInfo from '@/views/mes/md/client/components/FinanceInfo'
@@ -285,7 +289,7 @@ export default {
   name: "Client",
   dicts: ['mes_client_type','sys_yes_no'],
   components: {
-    AddrInfo, BaseInfo, DeliveryInfo, FinanceInfo, UrgeEmail, PaymentRelation, ClientContact, ClientItem
+    AddrInfo, BaseInfo, DeliveryInfo, FinanceInfo, UrgeEmail, PaymentRelation, ClientContact, Account, ClientItem
   },
   data() {
     return {

src/views/mes/order/sales/index.vue

@@ -29,7 +29,7 @@
       </el-form-item>
       <el-form-item label="跟单人" prop="merchandiser">
         <el-select v-model="queryParams.merchandiser" clearable filterable remote :remote-method="getUserList" placeholder="请选择跟单人">
-          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+          <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
         </el-select>
       </el-form-item>
       <el-form-item label="订单状态" prop="state">
@@ -99,8 +99,7 @@
       <el-table-column label="客户编号" prop="clientNo"/>
       <el-table-column label="交货期" prop="deliveryDate" width="180"/>
       <el-table-column label="总金额" prop="amount" :formatter="r => this.formatMoney(r.amount)"/>
-      <el-table-column label="跟单人" prop="merchandiser"
-                       :formatter="r => (this.userList.find(item => item.userId == r.merchandiser) || {}).nickName"/>
+      <el-table-column label="跟单人" prop="merchandiser"/>
       <el-table-column label="备注" prop="remark"/>
       <el-table-column label="订单状态" prop="state">
         <template slot-scope="{row}">

src/views/mes/pro/productionSolution/proofingApply.vue

@@ -21,14 +21,8 @@
           v-model="queryParams.prototypeRequestStatus"
           clearable
           placeholder="请输入生产用途"
+          @keyup.enter.native="usageName"
         >
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
         </el-select>
       </el-form-item>
       <!-- <el-form-item label="样品名称" prop="abbreviation">

src/views/mes/pro/workorder/indexApply.vue

@@ -164,12 +164,50 @@
           >生成任务单</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['mes:pro:workorder:edit']"
+        >导入工单</el-button>
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
+
+    <!-- 用户导入对话框 -->
+    <el-dialog title="导入工单" :visible.sync="upload.open" width="400px">
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
     <el-table
       v-loading="loading"
       :data="workorderList"
@@ -641,6 +679,7 @@ import VendorSelect from "@/components/vendorSelect/single.vue";
 import { genCode } from "@/api/system/autocode/rule";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getToken } from '@/utils/auth'
 
 export default {
   name: "Workorder",
@@ -677,6 +716,20 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/mes/pro/workorder/importData"
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -765,6 +818,30 @@ export default {
         this.loading = false;
       });
     },
+    importTemplate() {
+      this.download('mes/pro/workorder/importTemplate', {
+      }, `work_order_template_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.open = true;
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
     /** 转换生产工单数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {