From fcd72db7caf64f10c287c002da1f250a2c2547c0 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Thu, 2 Mar 2023 08:22:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E4=BF=AE=E6=94=B9=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/contractfile/ContractFileModel.java |  1 +
 .../service/impl/ContractFileServiceImpl.java | 28 +++++++-
 SC-web/src/layout/classic/sidebar/Logo.vue    |  2 +-
 .../basicInformation/contractfile/index.vue   | 66 +++++++++++++++----
 .../scm/basicInformation/customer/Form.vue    |  9 ++-
 .../scm/basicInformation/vehicle/Form.vue     |  2 +-
 6 files changed, 89 insertions(+), 19 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java
index 44f12451..97d46cf7 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java
@@ -45,4 +45,5 @@ public class ContractFileModel {
 
     private List<ContractFileModel> list;
     private String creatorTime;
+    private String code;
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
index 4cc4bc64..cf548ba1 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
@@ -7,7 +7,9 @@ import jnpf.contractfile.model.contractfile.ContractfileImportVO;
 import jnpf.contractfile.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.hutool.core.util.ObjectUtil;
-import jnpf.entity.EmployeeEntity;
+import jnpf.customer.mapper.CustomerVMapper;
+import jnpf.customer.entity.CustomerEntity;
+
 import jnpf.model.EmployeeModel;
 import jnpf.model.employee.EmployeeImportVO;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
@@ -22,6 +24,8 @@ import java.lang.reflect.Field;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
+import jnpf.supplier.entity.SupplierEntity;
+import jnpf.supplier.mapper.SupplierMapper;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +59,12 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
     @Autowired
     private Contract_item1Service contract_item1Service;
 
+    @Autowired
+    private SupplierMapper supplierMapper;
+
+    @Autowired
+    private CustomerVMapper customerMapper;
+
 
     @Override
     public List<ContractFileEntity> getList(ContractFilePagination contractFilePagination) {
@@ -340,8 +350,24 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
             if (model.getContractType() != null) {
                 if (model.getContractType().equals("采购合同")) {
                     model.setContractType("0");
+                    if (model.getName()!= null) {
+                        QueryWrapper<SupplierEntity> queryWrappers =  new QueryWrapper<SupplierEntity>();
+                        queryWrappers.eq("supplier_name",model.getName());
+                        List<SupplierEntity> list = supplierMapper.selectList(queryWrappers);
+                        if (list.size()>0){
+                            model.setCode(list.get(0).getId());
+                        }
+                    }
                 } else if (model.getContractType().equals("销售合同")) {
                     model.setContractType("1");
+                    if (model.getName()!=null){
+                        QueryWrapper<CustomerEntity> queryWrappers =  new QueryWrapper<CustomerEntity>();
+                        queryWrappers.eq("supplier_nm",model.getName());
+                        List<CustomerEntity> list = customerMapper.selectList(queryWrappers);
+                        if (list.size()>0){
+                            model.setCode(list.get(0).getId());
+                        }
+                    }
                 }
             }
             if (model.getClassification() != null) {
diff --git a/SC-web/src/layout/classic/sidebar/Logo.vue b/SC-web/src/layout/classic/sidebar/Logo.vue
index e0c39c80..3dfe979a 100644
--- a/SC-web/src/layout/classic/sidebar/Logo.vue
+++ b/SC-web/src/layout/classic/sidebar/Logo.vue
@@ -20,7 +20,7 @@
         </el-image>
 
         <img src="@/assets/images/登录进去页面的.png" class="sidebar-logo" v-else />
-        
+
       </router-link>
 
     </transition>
diff --git a/SC-web/src/views/scm/basicInformation/contractfile/index.vue b/SC-web/src/views/scm/basicInformation/contractfile/index.vue
index 548f48ac..c611d78a 100644
--- a/SC-web/src/views/scm/basicInformation/contractfile/index.vue
+++ b/SC-web/src/views/scm/basicInformation/contractfile/index.vue
@@ -25,14 +25,16 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
-            						</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            </el-button>
             <!--            <el-button type="text" icon="=el-icon-detail" @click="goDetail(scope.row.id)">查看-->
             <!--            </el-button>-->
             <el-button type="text" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <!--						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除-->
-            <!--						</el-button>-->
+
+            <el-button type="text" icon="el-icon-upload2" @click="uploadForm">导入</el-button>
+
+
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
@@ -54,7 +56,13 @@
               {{ scope.row.contractType | dynamicText(contractTypeOptions) }}
             </template>
           </el-table-column>
-          <el-table-column prop="classification" label="合同分类 " width="120" align="center" sortable/>
+
+          <el-table-column prop="classification" label="合同分类 " width="120" align="center" sortable>
+            <template slot-scope="scope">
+              {{ scope.row.classification | dynamicText(classificationOptions) }}
+            </template>
+          </el-table-column>
+
           <el-table-column prop="declarationDate" label="申报日期" width="120" align="center" sortable/>
           <el-table-column prop="name" label="供应商/客户名" width="200" align="center" sortable/>
           <el-table-column prop="num" label="数量" width="120" align="center" sortable/>
@@ -98,10 +106,15 @@
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+
+    <ImportForm v-if="importFormVisible" ref="importForm" @refresh="reset()" />
+
   </div>
 </template>
 
 <script>
+  import ImportForm from './ImportForm'
+
   import request from '@/utils/request'
   import {
     getDictionaryDataSelector
@@ -113,11 +126,14 @@
   } from '@/api/systemData/dataInterface'
   import Detail from './Detail'
 
+
   export default {
     components: {
       JNPFForm,
       ExportBox,
-      Detail
+      Detail,
+
+      ImportForm
     },
     data() {
       return {
@@ -142,6 +158,9 @@
           sidx: ''
         },
         formVisible: false,
+
+        importFormVisible: false,
+
         exportBoxVisible: false,
         columnList: [{
           prop: 'contractCode',
@@ -202,10 +221,10 @@
         ],
         contractTypeOptions: [{
           'fullName': '采购合同',
-          'id': '1'
+          'id': '0'
         }, {
           'fullName': '销售合同',
-          'id': '2'
+          'id': '1'
         },
           {
             'fullName': '租赁合同',
@@ -225,7 +244,21 @@
 
         statusOptions: [{
           "fullName": "进行中",
-          "id": "1"
+          "id": "0",
+        },{
+          "fullName": "审批中",
+          "id": "1",
+        },{
+          "fullName": "审批结束",
+          "id": "2"
+        }],
+
+        classificationOptions: [{
+          "fullName": "采购类",
+          "id": "0",
+        },{
+          "fullName": "销售类",
+          "id": "1",
         }],
 
         contractTypeProps: {
@@ -250,10 +283,10 @@
         })
       },
       sortChange({
-        column,
-        prop,
-        order
-      }) {
+                   column,
+                   prop,
+                   order
+                 }) {
         this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
         this.listQuery.sidx = !order ? '' : prop
         this.initData()
@@ -381,6 +414,13 @@
           this.query[key] = undefined
         }
         this.search()
+      },
+
+      uploadForm() {
+        this.importFormVisible = true
+        this.$nextTick(() => {
+          this.$refs.importForm.init()
+        })
       }
     }
   }
diff --git a/SC-web/src/views/scm/basicInformation/customer/Form.vue b/SC-web/src/views/scm/basicInformation/customer/Form.vue
index eaf4320d..41a88252 100644
--- a/SC-web/src/views/scm/basicInformation/customer/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/customer/Form.vue
@@ -2,7 +2,7 @@
 <el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
            :close-on-click-modal="false" append-to-body
            :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="1500px">
+           width="1000px">
 <el-row :gutter="15" class="">
 <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
     <template v-if="!loading">
@@ -207,8 +207,11 @@
                                     trigger: 'blur'
                                 },
                         ],
-                            contactPhone: [
-                        ],
+              contactPhone: [{
+                  pattern: /^1[3456789]\d{9}$/,
+                  message: '请输入正确的手机号码',
+                  trigger: 'blur'
+                },]
             },
                     orgIdcolumnOptions:[ {"label":"机构编号","value":"F_EnCode"}, {"label":"公司名称","value":"F_FullName"},],
                         customerLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"}],
diff --git a/SC-web/src/views/scm/basicInformation/vehicle/Form.vue b/SC-web/src/views/scm/basicInformation/vehicle/Form.vue
index 0caf599f..5a89afb6 100644
--- a/SC-web/src/views/scm/basicInformation/vehicle/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/vehicle/Form.vue
@@ -122,7 +122,7 @@
 
           contact: [{ required: true, message: '手机号不能为空' },
             { type: 'number',
-              message: '手机号格式不正确',
+              message: '请输入正确的手机号码',
               trigger: 'blur',
               transform(value) {
                 var contactreg = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/