修改创建人

src/api/basicdata/basicClient.js

@@ -11,6 +11,16 @@ export const getList = (current, size, params) => {
     }
   })
 }
+
+export const getListCode = (params) => {
+  return request({
+    url: '/api/logpm-basicdata/basicdataClient/listCode',
+    method: 'get',
+    params: {
+      ...params,
+    }
+  })
+}
 export const getListClient = (current, size, params) => {
   return request({
     url: '/api/logpm-basicdata/basicdataClient/list',

src/views/basicdata/brand/basicClient.vue

@@ -191,11 +191,12 @@
                  v-model="box"
                  width="35%"
                  :before-close="beforeClose"
+                 :close-on-click-modal="false"
                  append-to-body>
         <el-form :disabled="view" ref="form" :model="form" :rules="rules" label-width="120px">
           <!-- 表单字段 -->
           <el-form-item label="客户编码" prop="reserve1">
-            <el-input v-model="form.reserve1" placeholder="请输入客户编码" style="width: 100%" />
+            <el-input v-model="form.reserve1" :validate-method="validateInput" placeholder="请输入客户编码" style="width: 100%" />
           </el-form-item>
           <el-form-item label="客户名称" prop="clientName">
             <el-input v-model="form.clientName" placeholder="请输入客户名称" style="width: 100%" />
@@ -290,6 +291,7 @@
               :on-success="(response, file, fileList) => {uploadSuccess(fileList)}"
               :on-remove="handleRemove"
               :before-remove="beforeRemove"
+              :before-upload="beforeUploadFn"
               :limit="3"
               :on-exceed="handleExceed"
             >
@@ -371,7 +373,7 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, updateCargoControl,remove } from '@/api/basicdata/basicClient';
+import { getList, getDetail, add, update, updateCargoControl, remove, getListCode } from '@/api/basicdata/basicClient';
 import option from '@/option/basicdata/basicClient';
 import { mapGetters } from 'vuex';
 import BasicShopSub from '@/views/basicdata/brand/basicShopSub.vue';
@@ -474,13 +476,14 @@ export default {
         reserve1: [
           { required: true, message: '请输入客户编码', trigger: 'blur' },
           // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+          { validator: this.validateInput, trigger: 'blur' }
         ],
         clientName: [
           { required: true, message: '请输入客户名称', trigger: 'blur' },
           // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
         ],
         typeService: [
-          { required: true, message: '请选择客户端类型', trigger: 'change' }
+          { required: true, message: '请选择客户端类型', trigger: 'blur' }
         ],
         businessType: [
           { required: true, message: '请选择配送业务类型', trigger: 'change' },
@@ -549,9 +552,30 @@ export default {
     }
   },
   methods: {
+    //远程校验
+    validateInput(value,a) {
+      // console.log("执行了",value,a);
+      return new Promise((resolve, reject) => {
+        // 发送异步请求到服务器进行校验
+        // 假设请求返回的数据为 { valid: true } 表示校验通过
+        // 模拟异步请求，假设延时1秒
+        setTimeout(async () => {
+          const response = { valid: false }; // 假设校验通过
+         await getListCode({ code: a }).then(res =>{
+            // console.log("smgsmg",res.data);
+           if (res.data.data.length > 0) {
+             reject(new Error('编码已存在')); // 校验不通过，调用 reject() 并传递错误信息
+           } else {
+             resolve(); // 校验通过，调用 resolve()
+           }
+          })
+        }, 1000);
+      });
+    },
+
     coverCharge(num) {
       this.distriType = false;
-      console.log(num);
+      // console.log(num);
       num.forEach(i =>{
         if(i == '3'){
           this.distriType = true;
@@ -565,7 +589,7 @@ export default {
 
     //
     handleMall(row) {
-      console.log('>>>', row);
+      // console.log('>>>', row);
       this.$router.push({
         path: '/basicdata/brand/basicdataTripartiteMall',
         query: {
@@ -578,7 +602,7 @@ export default {
     //打开文件
     downloadLink(row) {
       console.log('>>>>>', row);
-      window.open('http://192.168.2.100:8012/onlinePreview?url=' + encodeURIComponent(Base64.encode(row.leaseAccessories)));
+      window.open('http://192.168.10.100:8012/onlinePreview?url=' + encodeURIComponent(Base64.encode(row.leaseAccessories)));
     },
     //控制控货
     makeCargo(row) {
@@ -643,6 +667,20 @@ export default {
       // console.log('3333333',file, fileList);
       this.showImgViewer = false;
     },
+    //文件上传前的一些业务需要的校验
+    beforeUploadFn (file, fileList) {
+      // console.log("上传校验");
+      let fileNameLength = file.name.lastIndexOf('.') // 文件名开始到最后一个点的长度
+      let fileFormat = file.name.substring(fileNameLength + 1, (file.name).length)
+      fileFormat = fileFormat.toLowerCase()
+      let imgArr = ['txt']
+      if (imgArr.includes(fileFormat)) {
+        // this.warning(this.$t('lang.fileFormat'))
+        return false
+      } else {
+        return true
+      }
+    },
     handlePreview(file) {
       console.log('111111', file);
       this.imgPreviewUrl[0] = file.response.data.link;
@@ -1013,6 +1051,10 @@ export default {
       this.form = {};
       this.view = false;
     },
+    onClose(done) {
+
+      console.log("执行了");
+    },
     selectionChange(list) {
       this.selectionList = list;
     },

src/views/basicdata/brand/basicClientFrom.vue

@@ -570,7 +570,7 @@ export default {
     //打开文件
     downloadLink(row) {
       console.log('>>>>>', row);
-      window.open('http://192.168.2.100:8012/onlinePreview?url=' + encodeURIComponent(Base64.encode(row.leaseAccessories)));
+      window.open('http://192.168.10.100:8012/onlinePreview?url=' + encodeURIComponent(Base64.encode(row.leaseAccessories)));
     },
     //控制控货
     makeCargo(row) {

src/views/distribution/inventory/delivery/distributionStockArticle.vue

@@ -332,6 +332,7 @@ import option from "@/option/distribution/distributionStockArticle";
 import { mapGetters } from "vuex";
 import { getDictionaryBiz } from '@/api/system/dict';
 import dayjs from 'dayjs';
+import { getUser } from '@/api/system/user';
 
 export default {
   data () {
@@ -682,16 +683,16 @@ export default {
           fixed: false,
           sortable: true,
         },
-        // {
-        //   prop: 'createUser',
-        //   label: '创建人',
-        //   type: 1,
-        //   values: '',
-        //   width: '150',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
+        {
+          prop: 'createUserName',
+          label: '创建人',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'createTime',
           label: '创建时间',
@@ -1328,7 +1329,8 @@ export default {
         console.log(">>>>>>>",data.records);
         this.page.total = data.total;
         this.data = data.records;
-        this.data = this.data.map(i => {
+        this.data = this.data.map( i => {
+          // console.log("iiiii",i.createUser);
           const freezeStatusMap = {
             0: "未冻结",
             1: "已冻结",
@@ -1352,7 +1354,7 @@ export default {
           i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
           i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
           i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
-          console.log("i.totalNumber",i.totalNumber,"i.handQuantitys",i.handQuantity);
+          // console.log("i.totalNumber",i.totalNumber,"i.handQuantitys",i.handQuantity);
           i.notReceived = parseInt( i.totalNumber) - parseInt(i.handQuantity);
           return i;
         });

src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue

@@ -683,7 +683,7 @@ export default {
           fixed: false,
           sortable: true,
         }, {
-          prop: 'createUser',
+          prop: 'createUserName',
           label: '创建人',
           type: 1,
           values: '',

src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue

@@ -682,7 +682,7 @@ export default {
           fixed: false,
           sortable: true,
         }, {
-          prop: 'createUser',
+          prop: 'createUserName',
           label: '创建人',
           type: 1,
           values: '',
@@ -1321,6 +1321,7 @@ export default {
     onLoad (page, params = {}) {
       this.loading = true;
       this.query.genre = 1;
+      this.query.typeService = 2;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         console.log(">>>>>>>",data.records);

src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

@@ -759,7 +759,7 @@ export default {
           fixed: false,
           sortable: true,
         }, {
-          prop: 'createUser',
+          prop: 'createUserName',
           label: '创建人',
           type: 1,
           values: '',

src/views/distribution/inventory/distributionStockArticleDetails.vue

@@ -547,6 +547,13 @@ export default {
         const data = res.data.data;
         this.page.total = data.total;
         this.dataPare = data.records;
+        this.dataPare.some( i =>{
+          if(i.conditions == '1'){
+            i.conditions = '定制品'
+          }else{
+            i.conditions = '库存品'
+          }
+        })
         this.loading = false;
         this.selectionClear();
       });

src/views/distribution/stockup/distributionStockupDetails.vue

@@ -639,12 +639,12 @@ export default {
         const data = res.data.data;
         this.data[0] = data;
         const { serveType, deliveryWay, deliveryType } = this.data[0];
-        const serveTypes = serveType.split(',');
-        const deliveryWays = deliveryWay.split(',');
-        const deliveryTypes = deliveryType.split(',');
-        const serveTypeName = this.getOwnServer(serveTypes, '', this.serveTypeList) || null;
-        const deliveryWayName = this.getOwnServer(deliveryWays, '', this.deliveryWayList) || null;
-        const deliveryTypeName = this.getOwnServer(deliveryTypes, '', this.distributionType) || null;
+        const serveTypes = !!serveType ? serveType.split(',') : null;
+        const deliveryWays = !!deliveryWay ? deliveryWay.split(',') : null;
+        const deliveryTypes = !!deliveryType ?  deliveryType.split(',') : null;
+        const serveTypeName =!!serveTypes ? this.getOwnServer(serveTypes, '', this.serveTypeList) || null : null;
+        const deliveryWayName =!!deliveryWays ? this.getOwnServer(deliveryWays, '', this.deliveryWayList) || null : null;
+        const deliveryTypeName =!!deliveryTypes ? this.getOwnServer(deliveryTypes, '', this.distributionType) || null : null;
         Object.assign(this.data[0], {
           serveTypeName,
           deliveryWayName,
@@ -722,7 +722,9 @@ export default {
     },
     //转换类型
     getOwnServer(row,name,list){
+      console.log(">>>>>",row);
       row.forEach( i =>{
+        console.log(i,"-=-=-=-");
         let a = list.find( s => s.dictKey == i);
         name += a.dictValue+' ';
       });