Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.2.1",
-  "description": "途宝仓储管理系统",
+  "description": "途宝智慧云仓平台",
   "author": "途宝",
   "license": "MIT",
   "scripts": {

src/api/warehouseBusiness/stockTransfer.js

@@ -122,3 +122,10 @@ export function backFee(fId) {
     method: 'get',
   })
 }
+//查询流水单号
+export function serialNumber() {
+  return request({
+    url: '/warehouseBusiness/stockTransfer/serialNumber',
+    method: 'post',
+  })
+}

src/api/warehouseBusiness/warehouseInStock.js

@@ -100,6 +100,7 @@ export function revoke(fId) {
     method: 'get',
   })
 }
+
 // 状态为4撤销(请核)
 export function revokeTwo(data) {
   return request({
@@ -108,3 +109,10 @@ export function revokeTwo(data) {
     data: data
   })
 }
+//查询流水单号
+export function serialNumber() {
+  return request({
+    url: '/warehouseBusiness/inStock/serialNumber',
+    method: 'post',
+  })
+}

src/api/warehouseBusiness/warehouseOutStock.js

@@ -110,3 +110,10 @@ export function revokeTwo(data) {
     data: data
   })
 }
+//查询流水单号
+export function serialNumber() {
+  return request({
+    url: '/warehouseBusiness/outStock/serialNumber',
+    method: 'post',
+  })
+}

src/layout/components/Navbar.vue

@@ -26,7 +26,7 @@
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+          <img :src="avatar" onerror="this.src = 'https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1684356118,1784469661&fm=26&gp=0.jpg'" class="user-avatar">
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">

src/layout/components/Sidebar/Logo.vue

@@ -47,7 +47,7 @@ export default {
   },
   data() {
     return {
-      title: "途宝仓储管理系统",
+      title: "途宝智慧云仓平台",
       logo: logoImg,
     };
   },

src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '途宝仓储管理系统',
+  title: '途宝智慧云仓平台',
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">{{company_name}}仓储管理系统</h3>
+      <h3 class="title">途宝智慧云仓平台</h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
 <!--          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />-->
@@ -52,7 +52,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2020-2022 {{company_name}}仓储管理系统</span>
+      <span>Copyright © 2020-2022 青岛途宝软件开发有限公司</span>
     </div>
   </div>
 </template>
@@ -67,7 +67,7 @@ export default {
   data() {
     return {
       codeUrl: "",
-      company_name:'途宝',
+      company_name:'途宝智能云仓',
       cookiePassword: "",
       loginForm: {
         username: "admin",

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -967,7 +967,7 @@
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.createBy"
-              :disabled="browseStatus"
+              disabled
               placeholder="上传人"
               show-word-limit
             />
@@ -978,6 +978,7 @@
           header-align="center"
           align="center"
           label="上传时间"
+          width="200px"
         >
           <template slot-scope="scope">
             <el-date-picker
@@ -994,12 +995,26 @@
           prop="fUrl"
           header-align="center"
           align="center"
-          width="80%"
+          width="300px"
           label="上传附件"
         >
-          <template slot-scope="scope">
-            <uploadFile @input="showFile" v-model="scope.row.fUrl"/>
+          <template slot-scope="scope" >
+            <el-upload
+              class="upload-demo"
+              :action="uploadImgUrl"
+              :on-success="(res,file)=>{handleSucces(scope,res,file)}"
+              :headers="headers"
+              style="width:25%;float: left"
+              :disabled="browseStatus"
+              :show-file-list="false"
+              :limit="1"
+            >
+              <el-button size="small" type="primary" :disabled="browseStatus">点击上传</el-button>
+            </el-upload>
+            <el-button size="small" type="primary" @click="checkFile(scope)">查看</el-button>
+            <el-button size="small" type="primary" :disabled="browseStatus" @click="deleteFile(scope)">删除</el-button>
           </template>
+
         </el-table-column>
         <el-table-column
           header-align="center"
@@ -1766,6 +1781,7 @@
   import { getAgreement } from '@/api/warehouseBusiness/agreement'
   import Treeselect from '@riophae/vue-treeselect'
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  import { getToken } from '@/utils/auth'
 
   export default {
     name: 'goodsTransfer',
@@ -1777,6 +1793,10 @@
     },
     data() {
       return {
+        headers: {
+          Authorization: 'Bearer ' + getToken()
+        },
+        uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
         fDNameOptions:[],
         fCNameOptions:[],
         activeNames:['1'],
@@ -2020,6 +2040,26 @@
       this.Jump()
     },
     methods: {
+      deleteFile(scope){
+        this.relevantAttachments[scope.$index].fName = ''
+        this.relevantAttachments[scope.$index].fUrl = ''
+        this.$message.success("删除成功")
+      },
+      checkFile(scope){
+
+        if(this.relevantAttachments[scope.$index].fUrl){
+          window.open(this.relevantAttachments[scope.$index].fUrl)
+        }else{
+          this.$message.error("请上传附件")
+        }
+      },
+      handleSucces(scope,res,file){
+        this.relevantAttachments[scope.$index].fName = res.fileName
+        this.relevantAttachments[scope.$index].fUrl = res.url
+        if(this.relevantAttachments[scope.$index].fUrl === ''){
+          this.$message.error('上传失败')
+        }
+      },
       //合计
       getSum(param){
         const { columns, data } = param

src/views/warehouseBusiness/inStock/index.vue

@@ -1578,12 +1578,21 @@
               width="300px"
               label="上传附件"
             >
-              <template slot-scope="scope">
-                <uploadFile
+              <template slot-scope="scope" >
+                <el-upload
+                  class="upload-demo"
+                  :action="uploadImgUrl"
+                  :on-success="(res,file)=>{handleSucces(scope,res,file)}"
+                  :headers="headers"
+                  style="width:25%;float: left"
                   :disabled="browseStatus"
-                  @input="showFile"
-                  v-model="scope.row.fUrl"
-                />
+                  :show-file-list="false"
+                  :limit="1"
+                >
+                  <el-button size="small" type="primary" :disabled="browseStatus">点击上传</el-button>
+                </el-upload>
+                <el-button size="small" type="primary" @click="checkFile(scope)">查看</el-button>
+                <el-button size="small" type="primary" :disabled="browseStatus" @click="deleteFile(scope)">删除</el-button>
               </template>
             </el-table-column>
             <el-table-column
@@ -2864,7 +2873,8 @@ import {
   updateWarehousebills,
   exportWarehousebills,
   revoke,
-  revokeTwo
+  revokeTwo,
+  serialNumber
 } from "@/api/warehouseBusiness/warehouseInStock";
 import { listAgreement, operationAgreement } from "@/api/agreement/agreement";
 import { listCorps } from "@/api/basicdata/corps";
@@ -2872,9 +2882,6 @@ import { listCorps } from "@/api/basicdata/corps";
 import { listFees, getFees } from "@/api/basicdata/fees";
 
 import {listWarehouse, treeselect , listWarehousesss } from "@/api/basicdata/warehouse";
-
-import { listArea } from "@/api/basicdata/area";
-
 import { listGoods } from "@/api/basicdata/goods";
 
 
@@ -2886,6 +2893,7 @@ import { getCharge } from '@/api/finance/charge'
 import Global from '@/layout/components/global';
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getToken } from '@/utils/auth'
 export default {
   name: "Warehousebills",
   components: {
@@ -2896,6 +2904,10 @@ export default {
   },
   data() {
     return {
+      headers: {
+        Authorization: 'Bearer ' + getToken()
+      },
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       company:'',
       fSerialNumber:'',
       fDNameOptions:[],
@@ -3241,6 +3253,25 @@ export default {
     this.adoPt()
   },
   methods: {
+    deleteFile(scope){
+      this.relevantAttachments[scope.$index].fName = ''
+      this.relevantAttachments[scope.$index].fUrl = ''
+    },
+    checkFile(scope){
+
+      if(this.relevantAttachments[scope.$index].fUrl){
+        window.open(this.relevantAttachments[scope.$index].fUrl)
+      }else{
+        this.$message.error("请上传附件")
+      }
+    },
+    handleSucces(scope,res,file){
+      this.relevantAttachments[scope.$index].fName = res.fileName
+      this.relevantAttachments[scope.$index].fUrl = res.url
+      if(this.relevantAttachments[scope.$index].fUrl === ''){
+        this.$message.error('上传失败')
+      }
+    },
     //合计
     getSum(param){
       const { columns, data } = param
@@ -3785,7 +3816,6 @@ export default {
           this.fPackagespecs = this.dataListSelection[0].fPackagespecs
           this.fMblno = this.dataListSelection[0].fMblno
           this.fQty = this.dataListSelection[0].fQty
-          console.log(this.dataListSelection[0])
           // this.fAddr = this.dataListSelection[0].fQty
           var date = new Date(this.dataListSelection[0].fBsdate)
           var Y = date.getFullYear() + '-'
@@ -3795,7 +3825,14 @@ export default {
         }
         this.editDialogVisible_sss = true
         this.fBstime = this.form.fBstime
-        this.fSerialNumber = this.dataList[0].fSerialNumber
+        if(!this.dataListSelection[0].fSerialNumber){
+          serialNumber().then(response =>{
+            console.log(response)
+            this.fSerialNumber = response.data.fSerialNumber
+          })
+        }else{
+          this.fSerialNumber = this.dataListSelection[0].fSerialNumber
+        }
         for(let item in this.businessTypeOption){
           if(this.form.fBusinessType == this.businessTypeOption[item].dictValue){
             this.businessType = this.businessTypeOption[item].dictLabel
@@ -3804,6 +3841,7 @@ export default {
       } else {
         this.$message.error('请选择需要打印的明细!')
       }
+      console.log(this.Printinglist)
     },
     // 收款信息新行
     addCollection() {
@@ -4003,62 +4041,6 @@ export default {
       // 查询库区下 所有库位
       // this.warehouseMethod();
     },
-    //所有库位信息
-    // warehouseMethod() {
-    //   var  fWarehouseid = this.form.fWarehouseid ;
-    //   let queryParams = { pageNum: 1, pageSize: 10, fStatus: 0, delFlag: 0, fWarehouseid : fWarehouseid };
-    //   listWarehouse(queryParams).then((response) => {
-    //     this.kqhouseOptions = response.rows;
-    //   });
-    // },
-
-    // 导入付款信息
-    // whgenlegData() {
-    //   if (this.dialogWhgenlegList.length === 0) {
-    //     this.$message({
-    //       message: "请选择需要导入的数据",
-    //       type: "warning",
-    //     });
-    //   } else {
-    //     for (let whgen in this.dialogWhgenlegList) {
-    //       let feeId = this.dialogWhgenlegList[whgen].feeFId;
-    //       getFees(feeId).then((response) => {
-    //         console.log(response)
-    //         this.fWbuOptions.push(response.data);
-    //       });
-    //       let qty = 1;
-    //       if (this.dialogWhgenlegList[whgen].fFeeUnitid === 1) {
-    //         qty = this.fQty
-    //       } else if (this.dialogWhgenlegList[whgen].fFeeUnitid === 2) {
-    //         qty = (this.fGrossweight/1000).toFixed(2)
-    //       } else if (this.dialogWhgenlegList[whgen].fFeeUnitid === 3) {
-    //         qty = (this.fNetweight/1000).toFixed(2)
-    //       } else if (this.dialogWhgenlegList[whgen].fFeeUnitid === 4) {
-    //         qty = this.fVolumn
-    //       }
-    //       // qty=(qty/1000).toFixed(2);
-    //       let fAmount = parseFloat(Number(this.dialogWhgenlegList[whgen].fPrice) * Number(qty)).toFixed(2)
-    //
-    //       this.warehouseDrList.push({
-    //         fQty: qty,
-    //         fCorpid: this.dialogWhgenlegList[whgen].fCorpid,
-    //         fFeeid: feeId,
-    //         fFeeunitid: this.dialogWhgenlegList[whgen].fFeeUnitid + '',
-    //         fUnitprice: this.dialogWhgenlegList[whgen].fPrice,
-    //         fCurrency: 'RMB',
-    //         fExrate: 1,
-    //         fAmount: fAmount,
-    //         fTaxrate: this.fTaxrate,
-    //         fMblno:this.form.fMblno,
-    //         fProductName:this.form.fProductName,
-    //         fMarks:this.form.fMarks,
-    //         fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
-    //       })
-    //     }
-    //     this.warehousingagreement = false;
-    //   }
-    // },
-
     //导入收付款信息明细
     zhgenlegData() {
       if (this.dialogWhgenlegList.length === 0) {
@@ -4361,6 +4343,11 @@ export default {
       const fId = row.fId || this.ids;
       this.goodsRemoteMethod()
       getWarehousebills(fId).then((response) => {
+        if(response.data.enclosures){
+          for(let item in response.data.enclosures){
+            this.fUrl = response.data.enclosures[item].fUrl
+          }
+        }
         if (response.data.warehousebills) {
           this.form = response.data.warehousebills;
           this.before = this.form.createBy
@@ -4850,6 +4837,7 @@ export default {
               dataList.push(this.dataListSelection[se])
             }
           }
+          dataList[0].fSerialNumber = this.fSerialNumber
           if (dataList.length !== 0) {
             let formData = new window.FormData();
             formData.append("warehouseBills", JSON.stringify(this.form));
@@ -4873,6 +4861,7 @@ export default {
                   }
                   this.$refs.checkout.clearSelection()
                 })
+                return
               }
             }
           }
@@ -5220,9 +5209,7 @@ export default {
         for(let item in this.warehouseDrList) {
           if (!this.warehouseDrList[item].fCorpid) {
             if (item === 'fBusinessType') {
-              console.log(item)
             } else {
-              console.log(this.warehouseDrList[item].fCorpid)
               this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行客户名称")
               return false
             }

src/views/warehouseBusiness/outStock/index.vue

@@ -1451,9 +1451,23 @@
               width="300px"
               label="上传附件"
             >
-              <template slot-scope="scope">
-                <uploadFile @input="showFile" v-model="scope.row.fUrl" />
+              <template slot-scope="scope" >
+                <el-upload
+                  class="upload-demo"
+                  :action="uploadImgUrl"
+                  :on-success="(res,file)=>{handleSucces(scope,res,file)}"
+                  :headers="headers"
+                  style="width:25%;float: left"
+                  :disabled="browseStatus"
+                  :show-file-list="false"
+                  :limit="1"
+                >
+                  <el-button size="small" type="primary" :disabled="browseStatus">点击上传</el-button>
+                </el-upload>
+                <el-button size="small" type="primary" @click="checkFile(scope)">查看</el-button>
+                <el-button size="small" type="primary" :disabled="browseStatus" @click="deleteFile(scope)">删除</el-button>
               </template>
+
             </el-table-column>
             <el-table-column header-align="center" align="center" label="操作">
               <template slot-scope="scope">
@@ -2793,6 +2807,7 @@ import {
   exportWarehousebills,
   revokeTwo,
   revoke,
+  serialNumber
 } from "@/api/warehouseBusiness/warehouseOutStock";
 
 import { listAgreement, operationAgreement } from "@/api/agreement/agreement";
@@ -2819,6 +2834,7 @@ import AddOrUpdate from "@/views/viewApproval";
 import ApprovalComments from '@/views/startApproval'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getToken } from '@/utils/auth'
 
 export default {
   name: "Warehousebills",
@@ -2830,6 +2846,10 @@ export default {
   },
   data() {
     return {
+      headers: {
+        Authorization: 'Bearer ' + getToken()
+      },
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       company:'',
       fSerialNumber:'',
       fDNameOptions:[],
@@ -3152,6 +3172,25 @@ export default {
     this.adoPt()
   },
   methods: {
+    deleteFile(scope){
+      this.relevantAttachments[scope.$index].fName = ''
+      this.relevantAttachments[scope.$index].fUrl = ''
+    },
+    checkFile(scope){
+
+      if(this.relevantAttachments[scope.$index].fUrl){
+        window.open(this.relevantAttachments[scope.$index].fUrl)
+      }else{
+        this.$message.error("请上传附件")
+      }
+    },
+    handleSucces(scope,res,file){
+      this.relevantAttachments[scope.$index].fName = res.fileName
+      this.relevantAttachments[scope.$index].fUrl = res.url
+      if(this.relevantAttachments[scope.$index].fUrl === ''){
+        this.$message.error('上传失败')
+      }
+    },
     //合计
     getSum(param){
       const { columns, data } = param
@@ -3872,7 +3911,14 @@ export default {
           this.openPrintJobSheet = true
           this.fBstime = this.form.fBstime
         }, 200);
-        this.fSerialNumber = this.dataList[0].fSerialNumber
+        if(!this.dataListSelection[0].fSerialNumber){
+          serialNumber().then(response =>{
+            console.log(response)
+            this.fSerialNumber = response.data.fSerialNumber
+          })
+        }else{
+          this.fSerialNumber = this.dataListSelection[0].fSerialNumber
+        }
         for(let item in this.businessTypeOption){
           if(this.form.fBusinessType == this.businessTypeOption[item].dictValue){
             this.businessType = this.businessTypeOption[item].dictLabel
@@ -4033,6 +4079,7 @@ export default {
       this.whgenlegParams.fWarehouseid = this.form.fWarehouseid;
       this.whgenlegParams.fTrademodeid = this.form.fTrademodeid;
       listWhgenleg(this.whgenlegParams).then((response) => {
+        console.log(response)
         this.whgenlegList = response.rows;
         this.whgenlegTotal = response.total;
       });
@@ -4689,12 +4736,13 @@ export default {
               dataList.push(this.dataListSelection[se])
             }
           }
+          dataList[0].fSerialNumber = this.fSerialNumber
           this.$refs.tableList.clearSelection();
           if (dataList.length !== 0) {
             let formData = new window.FormData();
             formData.append("warehouseBills", JSON.stringify(this.form));
             formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
-            formData.append("warehousebillsitems", JSON.stringify(this.dataList));
+            formData.append("warehousebillsitems", JSON.stringify(dataList));
             formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
             formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
             for(let index in dataList){
@@ -4713,7 +4761,7 @@ export default {
                     }
                   }
                 })
-
+                return
               }
             }
           }

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -1390,6 +1390,7 @@
               prop="createTime"
               header-align="center"
               align="center"
+              width="200px"
               label="上传时间"
             >
               <template slot-scope="scope">
@@ -1410,8 +1411,21 @@
               width="300px"
               label="上传附件"
             >
-              <template slot-scope="scope">
-                <uploadFile @input="showFile" v-model="scope.row.fUrl" />
+              <template slot-scope="scope" >
+                <el-upload
+                  class="upload-demo"
+                  :action="uploadImgUrl"
+                  :on-success="(res,file)=>{handleSucces(scope,res,file)}"
+                  :headers="headers"
+                  style="width:25%;float: left"
+                  :disabled="browseStatus"
+                  :show-file-list="false"
+                  :limit="1"
+                >
+                  <el-button size="small" type="primary" :disabled="browseStatus">点击上传</el-button>
+                </el-upload>
+                <el-button size="small" type="primary" @click="checkFile(scope)">查看</el-button>
+                <el-button size="small" type="primary" :disabled="browseStatus" @click="deleteFile(scope)">删除</el-button>
               </template>
             </el-table-column>
             <el-table-column header-align="center" align="center" label="操作">
@@ -2671,6 +2685,7 @@ import {
   warehouseSubmission,
   updateStockTransfer,
   exportStockTransfer,
+  serialNumber
 } from "@/api/warehouseBusiness/stockTransfer";
 
 import { listAgreement, operationAgreement } from "@/api/agreement/agreement";
@@ -2697,6 +2712,7 @@ import AddOrUpdate from '@/views/viewApproval'
 import ApprovalComments from '@/views/startApproval'
 import Treeselect from '@riophae/vue-treeselect'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getToken } from '@/utils/auth'
 
 export default {
   name: "Warehousebills",
@@ -2708,6 +2724,10 @@ export default {
   },
   data() {
     return {
+      headers: {
+        Authorization: 'Bearer ' + getToken()
+      },
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       company:'',
       fSerialNumber:'',
       fCNameOptions:[],
@@ -2782,11 +2802,11 @@ export default {
       fTaxrate: null,
       // 选中数组
       ids: [],
-      userVal: {
-        userName: null,
-        nickName: null,
-        deptId: null,
-      },
+      // userVal: {
+      //   userName: null,
+      //   nickName: null,
+      //   deptId: null,
+      // },
       queryForm: {},
       // 费用状态
       costStatus: 'Dr',
@@ -3012,6 +3032,25 @@ export default {
     this.Jump()
   },
   methods: {
+    deleteFile(scope){
+      this.relevantAttachments[scope.$index].fName = ''
+      this.relevantAttachments[scope.$index].fUrl = ''
+    },
+    checkFile(scope){
+
+      if(this.relevantAttachments[scope.$index].fUrl){
+        window.open(this.relevantAttachments[scope.$index].fUrl)
+      }else{
+        this.$message.error("请上传附件")
+      }
+    },
+    handleSucces(scope,res,file){
+      this.relevantAttachments[scope.$index].fName = res.fileName
+      this.relevantAttachments[scope.$index].fUrl = res.url
+      if(this.relevantAttachments[scope.$index].fUrl === ''){
+        this.$message.error('上传失败')
+      }
+    },
     //合计
     getSum(param){
       const { columns, data } = param
@@ -3283,10 +3322,10 @@ export default {
               this.$set(this.warehouseCrList[cr], "fFeeunitid", this.warehouseCrList[cr].fFeeunitid + '');
             }
           }
-          if (response.data.sysUser) {
-            this.userVal = response.data.sysUser
-            this.userOptions = response.data.sysUser;
-          }
+          // if (response.data.sysUser) {
+          //   // this.userVal = response.data.sysUser
+          //   this.userOptions = response.data.sysUser;
+          // }
           if (response.data.dept) {
             this.deptOptions = []
             this.deptOptions.push(response.data.dept)
@@ -3780,7 +3819,14 @@ export default {
         this.openPrintJobSheet = true
         this.fBstime = this.form.fBstime
       }, 200);
-      this.fSerialNumber = this.dataList[0].fSerialNumber
+      if(!this.dataListSelection[0].fSerialNumber){
+        serialNumber().then(response =>{
+          console.log(response)
+          this.fSerialNumber = response.data.fSerialNumber
+        })
+      }else{
+        this.fSerialNumber = this.dataListSelection[0].fSerialNumber
+      }
       for(let item in this.businessTypeOption){
         if(this.form.fBusinessType == this.businessTypeOption[item].dictValue){
           this.businessType = this.businessTypeOption[item].dictLabel
@@ -4062,6 +4108,7 @@ export default {
       this.detailsHidden = false;
       let data = row || this.ids;
       getStockTransfer(data.fId).then((response) => {
+        console.log(response)
         this.Operator = response.data.corps[0].createBy
         if (response.data.warehousebills) {
           this.form = response.data.warehousebills;
@@ -4111,10 +4158,12 @@ export default {
             this.$set(this.warehouseCrList[cr], "fFeeunitid", this.warehouseCrList[cr].fFeeunitid + "");
           }
         }
-        if (response.data.sysUser) {
-          this.userVal = response.data.sysUser
-          this.userOptions = response.data.sysUser;
-        }
+        // if (response.data.sysUser) {
+        //   // this.userVal = response.data.sysUser
+        //   this.userOptions = response.data.sysUser;
+        //   console.log(response.data.sysUser)
+        //   console.log(response.data.sysUser)
+        //  }
         if (response.data.dept) {
           this.deptOptions = []
           this.deptOptions.push(response.data.dept)
@@ -4153,6 +4202,7 @@ export default {
       this.detailsHidden = false;
       let data = row || this.ids;
       getStockTransfer(data.fId).then((response) => {
+        console.log(response)
         this.Operator = response.data.corps[0].createBy
         if (response.data.warehousebills) {
           this.form = response.data.warehousebills;
@@ -4207,7 +4257,7 @@ export default {
         }
         if (response.data.sysUser) {
           this.userVal = response.data.sysUser
-          this.userOptions = response.data.sysUser;
+          // this.userOptions = response.data.sysUser;
         }
         if (response.data.dept) {
           this.deptOptions = []
@@ -4309,9 +4359,11 @@ export default {
             this.$set(this.warehouseCrList[cr], "fFeeunitid", this.warehouseCrList[cr].fFeeunitid + '');
           }
         }
-        if (response.data.sysUser) {
-          this.userVal = response.data.sysUser
-        }
+        // if (response.data.sysUser) {
+        //   // this.userVal = response.data.sysUser
+        //   this.userOptions = response.data.sysUser;
+        //
+        // }
         if (response.data.dept) {
           this.deptOptions = []
           this.deptOptions.push(response.data.dept)
@@ -4622,7 +4674,8 @@ export default {
                 }
               }
               if (response.data.sysUser) {
-                this.userVal = response.data.sysUser
+                // this.userVal = response.data.sysUser
+                this.userOptions = response.data.sysUser;
               }
               if (response.data.dept) {
                 this.deptOptions = []
@@ -4697,6 +4750,7 @@ export default {
               dataList.push(this.dataListSelection[se])
             }
           }
+          dataList[0].fSerialNumber = this.fSerialNumber
           if (dataList.length !== 0) {
             let formData = new window.FormData();
             formData.append("warehouseBills", JSON.stringify(this.form));
@@ -4704,8 +4758,10 @@ export default {
             formData.append("warehousebillsitems", JSON.stringify(dataList));
             formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
             formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
+            console.log(dataList)
             for(let index in dataList){
               if(dataList[index].fBillstatus < 20) {
+
                 addJoblist(formData).then((response) => {
                   this.formBrowseStatus = true;
                   // this.$refs.tableDr.clearSelection();
@@ -4722,6 +4778,7 @@ export default {
                   }
                   this.$refs.tableList.clearSelection()
                 });
+                return
               }
             }
           }

vue.config.js

@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '途宝仓储管理系统' // 标题
+const name = defaultSettings.title || '途宝智慧云仓平台' // 标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -34,8 +34,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.137.1:9010`,
-         target: `http://121.36.212.131:9010/`,
+        target: `http://192.168.137.1:9010`,
+        // target: `http://engineering.echepei.com:9010/`,
+        //  target: `http://121.36.212.131:9010/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''