前端

package.json

@@ -39,7 +39,8 @@
     "build:publish": "node bin/deploy.js",
     "start": "electron .",
     "pack": "electron-builder --dir",
-    "dist": "electron-builder"
+    "dist": "electron-builder",
+    "postinstall": "patch-package"
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
@@ -119,9 +120,11 @@
     "mockjs": "^1.0.1-beta3",
     "node-rancher-client-api": "^1.1.1",
     "node-sass": "^4.14.1",
+    "patch-package": "^6.5.1",
     "postcss-import": "^11.1.0",
     "postcss-loader": "^2.0.8",
     "postcss-url": "^7.2.1",
+    "postinstall-postinstall": "^2.1.0",
     "runjs": "^4.4.2",
     "sass-loader": "^7.1.0",
     "throttle-debounce": "1.1.0",

src/api/V2/personnelManagement/index.js

@@ -2,3 +2,9 @@ export const API_GET_PERSON_LIST = '/clockInfo/selectClockInfoPc'
 export const API_GET_SUPP_LIST = '/clockInfo/selectClockInfoPc'
 //请假列表
 export const API_GET_LEAVE_LIST = '/leaveInfo/selectLeaveInfoPc'
+//车辆添加
+export const API_ADD_CARINFO = '/carInfo/api/addInfo'
+//车辆列表
+export const API_CARINFO = '/carInfo/selectCars'
+//车辆删除
+export const API_DEL_CARINFO = '/carInfo/api/deleteInfo'

src/components/WsUpload/index.vue

@@ -280,6 +280,7 @@ export default {
   },
 
   methods: {
+    
     ...mapActions('common', ['uploadShipFiles']),
     //pdf预览
     async toOpen(scope) {
@@ -297,6 +298,23 @@ export default {
     //   this.initFileList = fileList
     //   this.tempFileList = fileList
     // },
+    perview(row){
+      const typeArr = ['doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx']
+      let arr=row.url.split('.')
+      let fileType=arr[arr.length-1]
+      let url = ''
+      if (typeArr.indexOf(fileType) !== -1) {
+        // 使用微软的office online
+        url='http://view.xdocin.com/xdoc?_xdoc='+row.url
+      } else {
+        url = row.url
+      }
+      // window.open()居中打开
+      const width = 1000; const height = 800
+      const top = (window.screen.availHeight - height) / 2
+      const left = (window.screen.availWidth - width) / 2
+      window.open(url, '', 'width=' + width + ',height=' + height + ',top=' + top + ',left=' + left)
+    },
     // 获取图片文件
     _getFileImg(file) {
       if (!file) {
@@ -496,11 +514,17 @@ export default {
     // 处理下载
     _handleDownload(file, type) {
       if (this.isOnlineFile(file) && type === 'view') {
-        this.pdfUrl =
-          file.url || this.$store.getters.baseInfo.fileUrl + file.appendixPath
-        this.pdfFileName = file.appendixName || file.name
-        this.isShowPdf = true
-        return
+        console.log(file)
+        if(file.name.indexOf('pdf')!=-1||file.name.indexOf('tet')!=-1){
+          this.pdfUrl =
+            file.url || this.$store.getters.baseInfo.fileUrl + file.appendixPath
+          this.pdfFileName = file.appendixName || file.name
+          this.isShowPdf = true
+          return
+        }else{
+          this.perview(file)
+          return
+        }
       }
       downloadNow(file.url+'?s=' + Math.random().toString(), file.name, this.vesselBankFlag, type)
     },
@@ -597,7 +621,7 @@ export default {
     isOnlineFile(file) {
       if (file && file.name) {
         const name = this.getExtName(file.name)
-        return name === 'pdf' || name === 'tet'
+        return name === 'pdf' || name === 'tet'|| name === 'docx'
       }
       return false
     },

src/components/pdf/pdf.vue

@@ -37,10 +37,9 @@ export default {
   },
   methods: {
     pdfTask (pdfUrl) {
-        let CMAP_URL = 'https://unpkg.com/pdfjs-dist@2.0.943/cmaps/'
+      let CMAP_URL = 'https://unpkg.com/pdfjs-dist@2.0.943/cmaps/'
       var loadingTask = pdf.createLoadingTask({url: pdfUrl,withCredentials: false,cMapUrl: CMAP_URL,cMapPacked: true})
       loadingTask.promise.then(pdf => {
-        
         this.pdfUrl = loadingTask
         this.numPages = pdf.numPages
       }).catch((err) => {

src/model/houseSelfCollect/index.js

@@ -71,7 +71,8 @@ import {
     API_POST_GETVIDEO,
     API_POST_GETCARNUMBER,
     API_POST_GETOKEN,
-    API_POST_GEROM
+    API_POST_GEROM,
+    API_GETQUALITY
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -213,4 +214,6 @@ export const changeCustomer = appRx.post(API_POST_CUSTOMER, errorCatcher, errorH
 export const getwarehouse = appRx.get(API_GET_WAREHOUSE, errorCatcher, errorHandle, filter)
 
 export const getToken = appRx.post(API_POST_GETOKEN, errorCatcher, errorHandle, filter)
-export const getRom = appRx.post(API_POST_GEROM, errorCatcher, errorHandle, filter)
+export const getRom = appRx.post(API_POST_GEROM, errorCatcher, errorHandle, filter)
+// 查询交易量
+export const getquality = appRx.get(API_GETQUALITY, errorCatcher, errorHandle, filter)

src/model/personnelManagement/index.js

@@ -4,6 +4,9 @@ import {
     API_GET_PERSON_LIST,
     API_GET_SUPP_LIST,
     API_GET_LEAVE_LIST,
+    API_ADD_CARINFO,
+    API_CARINFO,
+    API_DEL_CARINFO
 } from '@/api/V2/personnelManagement'
 import {
     API_GET_DEPT,
@@ -18,3 +21,9 @@ export const getDeptList = appRx.get(API_GET_DEPT, errorCatcher, errorHandle, fi
 export const getSuppList = appRx.get(API_GET_SUPP_LIST, errorCatcher, errorHandle, filter)
 //请假列表
 export const getLeavePc = appRx.get(API_GET_LEAVE_LIST, errorCatcher, errorHandle, filter)
+//车辆添加
+export const addcarInfo = appRx.post(API_ADD_CARINFO, errorCatcher, errorHandle, filter)
+//车辆列表
+export const getcarInfo = appRx.get(API_CARINFO, errorCatcher, errorHandle, filter)
+//车辆删除
+export const delcarInfo = appRx.post(API_DEL_CARINFO, errorCatcher, errorHandle, filter)

src/views/contractManagement/acquisitionContractAdd.vue

@@ -47,6 +47,9 @@
         <ws-form-item v-show="deptBudgetList.agreementType =='收购合同'" label="合同编号" span="1" prop="contractNo" class="readonly" required>
           <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small" />
         </ws-form-item>
+        <ws-form-item  label="合同提示" span="1" prop="contractNo" >
+          <ws-input v-model="deptBudgetList.pointOut" placeholder="请输入合同提示" maxlength="10" size="small" />
+        </ws-form-item>
         <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           <el-radio v-model="deptBudgetList.transactionSubject" label="自营">自营</el-radio>
           <el-radio v-model="deptBudgetList.transactionSubject" label="合营">合营</el-radio>
@@ -751,6 +754,13 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
+        if(!this.deptBudgetList.pointOut){
+          this.$message({
+            message: '合同提示不能为空',
+            type: 'warning',
+          })
+          return
+        }
         if (
           this.deptBudgetList.contractNo.length < 5 ||
           this.deptBudgetList.contractNo.length > 50

src/views/contractManagement/collectionContractAdd.vue

@@ -26,6 +26,9 @@
             <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small"
               :rules="ruleDeptBudget" />
           </ws-form-item>
+          <ws-form-item  label="合同提示" span="1" prop="contractNo" >
+            <ws-input v-model="deptBudgetList.pointOut" placeholder="请输入合同提示" maxlength="10" size="small" />
+          </ws-form-item>
           <!--结算方式-->
           <ws-form-item label="结算方式" span="1" prop="settlementMethod">
             <ws-input v-model="deptBudgetList.settlementMethod" placeholder="请输入结算方式" maxlength="120" size="small" />
@@ -668,6 +671,13 @@
           })
           return
         }
+        if(!this.deptBudgetList.pointOut){
+          this.$message({
+            message: '合同提示不能为空',
+            type: 'warning',
+          })
+          return
+        }
         if (
           this.deptBudgetList.contractNo.length < 6 ||
           this.deptBudgetList.contractNo.length > 50

src/views/contractManagement/purchaseContractAdd.vue

@@ -22,7 +22,7 @@
       <el-col :span="12" style='text-align:right;'>
         <el-select v-model="contractNo" placeholder="请选择要复制的合同" class="typeselect" filterable clearable
               @change="copySelect">
-              <el-option v-for="(item,index) in outContractNo" :key="'hetong'+index" :label="item.contractNo"
+              <el-option v-for="(item,index) in outContractNo" :key="'hetong'+index" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
                 :value="item.contractNo" />
             </el-select>
             <el-button class="bg-bottom" type="primary" size="small" @click="cancelcopy()">取消复制
@@ -59,7 +59,7 @@
         <!--关联合同-->
         <ws-form-item prop="agreementNo" label="关联合同" span="1" v-show="deptBudgetList.agreementType =='补充协议'">
           <ws-select v-model="deptBudgetList.agreementNo" placeholder="请选择编号" @change="selectRelation">
-            <ws-option v-for="item in contractNoList"  :key="item.id" :label="item.contractNo"
+            <ws-option v-for="item in contractNoList"  :key="item.id" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
               :value="item.contractNo"></ws-option>
           </ws-select>
         </ws-form-item>
@@ -71,6 +71,9 @@
         <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly" required v-show="deptBudgetList.agreementType =='采购合同'">
           <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small" />
         </ws-form-item>
+        <ws-form-item  label="合同提示" span="1" prop="contractNo" >
+          <ws-input v-model="deptBudgetList.pointOut" placeholder="请输入合同提示" maxlength="10" size="small" />
+        </ws-form-item>
         <!--运输方式-->
         <ws-form-item label="运输方式" span="1" prop="shippingType">
           <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" />
@@ -1002,6 +1005,13 @@ import { isUndefined } from 'xe-utils/methods'
       },
 
       submit() {
+        if(!this.deptBudgetList.pointOut){
+          this.$message({
+            message: '合同提示不能为空',
+            type: 'warning',
+          })
+          return
+        }
         if(this.deptBudgetList.transactionSubject == '合营'){
           if (!this.deptBudgetList.jointVentureParties) {
           this.$message({

src/views/contractManagement/salesContractAdd.vue

@@ -23,7 +23,7 @@
               <el-col :span="12" style='text-align:right;'>
               <el-select v-model="contractNo" placeholder="请选择要复制的合同" class="typeselect" filterable clearable
                   @change="copySelect">
-                    <el-option v-for="(item,index) in outContractNo" :key="'hetong'+index" :label="item.contractNo"
+                    <el-option v-for="(item,index) in outContractNo" :key="'hetong'+index" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
                       :value="item.contractNo" />
                   </el-select>
                   <el-button class="bg-bottom" type="primary" size="small" @click="cancelcopy()">取消复制
@@ -44,6 +44,9 @@
             <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small"
               :rules="ruleDeptBudget" />
           </ws-form-item>
+          <ws-form-item  label="合同提示" span="1" prop="contractNo" >
+            <ws-input v-model="deptBudgetList.pointOut" placeholder="请输入合同提示" maxlength="10" size="small" />
+          </ws-form-item>
           <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           <el-radio v-model="deptBudgetList.transactionSubject" label="自营">自营</el-radio>
           <el-radio v-model="deptBudgetList.transactionSubject" label="合营">合营</el-radio>
@@ -912,6 +915,13 @@
           })
           return
         }
+        if(!this.deptBudgetList.pointOut){
+          this.$message({
+            message: '合同提示不能为空',
+            type: 'warning',
+          })
+          return
+        }
         if (
           this.deptBudgetList.contractNo.length < 6 ||
           this.deptBudgetList.contractNo.length > 50

src/views/contractManagement/storageContractAdd.vue

@@ -26,6 +26,9 @@
             <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small"
               :rules="ruleDeptBudget" />
           </ws-form-item>
+          <ws-form-item  label="合同提示" span="1" prop="contractNo" >
+            <ws-input v-model="deptBudgetList.pointOut" placeholder="请输入合同提示" maxlength="10" size="small" />
+          </ws-form-item>
           <!--运输方式-->
         <ws-form-item label="运输方式" span="1" prop="shippingType">
           <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" />
@@ -729,6 +732,13 @@
           })
           return
         }
+        if(!this.deptBudgetList.pointOut){
+          this.$message({
+            message: '合同提示不能为空',
+            type: 'warning',
+          })
+          return
+        }
         if (
           this.deptBudgetList.contractNo.length < 6 ||
           this.deptBudgetList.contractNo.length > 50

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -942,7 +942,6 @@ export default {
         }
 
       }
-
     },
     deductionchange() {
       if (this.deptBudgetList.type == '潮粮') {
@@ -1149,8 +1148,8 @@ export default {
         }
       }
       if (this.deptBudgetList.goodsName && this.deptBudgetList.customerName) {
-        await getquality({ goodsName: this.deptBudgetList.goodsName, compId: localStorage.getItem('ws-pf_compId'), warehouseName: this.warehouseName, customerNumberCard: this.deptBudgetList.customerNumberCard })
-          .toPromise().then((response) => {
+        var response=await getquality({ goodsName: this.deptBudgetList.goodsName, compId: localStorage.getItem('ws-pf_compId'), warehouseName: this.warehouseName, customerNumberCard: this.deptBudgetList.customerNumberCard })
+          .toPromise()
             if (response.A + response.B + response.C * 50 > response.D - 50) {
               this.redstatus = true
             } else {
@@ -1162,7 +1161,6 @@ export default {
 
             this.deptBudgetList.volumeofbusiness = a + b + c
             this.$forceUpdate()
-          })
       }
     },
     waterContentChange(type) {

src/views/personnelManagement/component/router/route.js

@@ -22,6 +22,7 @@ const checkWorkListRouter = {
                 module: 'customerManagement.customer.customerInfo',
                 permissicon: [],
                 keepAlive: true,
+                _title:'考勤管理'
                 // module: 'procurement.sparepart.applDetail'
             },
             // hidden: true
@@ -37,6 +38,7 @@ const checkWorkListRouter = {
                 module: 'kaoqin.qingjia.view',
                 permissicon: [],
                 keepAlive: true,
+                _title:'请假管理'
                 // module: 'procurement.sparepart.applDetail'
             },
             // hidden: true
@@ -52,11 +54,27 @@ const checkWorkListRouter = {
                 module: 'kaoqin.buka.view',
                 permissicon: [],
                 keepAlive: true,
+                _title:'补卡管理'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            // hidden: true
+        },
+        {
+            path: 'carNoList',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/personnelManagement/carNoList'),
+            name: 'carNoList',
+            meta: {
+                title: '车辆管理',
+                shortcutEntrance: 'leaveList',
+                module: 'kaoqin.buka.view',
+                permissicon: [],
+                keepAlive: true,
+                _title:'车辆管理'
                 // module: 'procurement.sparepart.applDetail'
             },
             // hidden: true
         },
-
 
 
     ],

src/views/platformAudit/component/routers/route.js

@@ -1,17 +1,17 @@
 import Layout from '@/layout/index';
 
-const platformauditRouter = {
-    path: '/platformaudit',
-    component: Layout,
-    redirect: '/platformaudit',
-    name: 'platformaudit',
-    alwaysShow: true, // will always show the root menu
-    meta: {
-        title: 'platformaudit',
-        module: 'audit',
-        icon: '-shenhe'
-    },
-    children: [
+// const platformauditRouter = {
+//     path: '/platformaudit',
+//     component: Layout,
+//     redirect: '/platformaudit',
+//     name: 'platformaudit',
+//     alwaysShow: true, // will always show the root menu
+//     meta: {
+//         title: 'platformaudit',
+//         module: 'audit',
+//         icon: '-shenhe'
+//     },
+//     children: [
 
         // 粮商审核
         // {
@@ -136,6 +136,6 @@ const platformauditRouter = {
         //         _title: '客服留言'
         //     },
         // },
-    ],
-};
-export default platformauditRouter;
+//     ],
+// };
+// export default platformauditRouter;

src/views/purchasingManagement/purchaseOrderList.vue

@@ -397,7 +397,7 @@
         </el-form-item>
         <el-form-item label="合同编号" :label-width="formLabelWidth">
           <el-select v-model="aduitlist.contractNo" placeholder="请选择合同编号" class="deal" filterable clearable>
-            <el-option v-for="item in options" :key="item.constKey" :label="item.contractNo" :value="item.contractNo" />
+            <el-option v-for="item in options" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')" :value="item.contractNo" />
           </el-select>
         </el-form-item>
       </el-form>

src/views/salesManagement/salesPlanOrderList.vue

@@ -411,7 +411,7 @@
         </el-form-item>
         <el-form-item label="合同编号" :label-width="formLabelWidth">
           <el-select v-model="aduitlist.contractNo" placeholder="请选择合同编号" class="deal" filterable clearable>
-            <el-option v-for="item in options" :key="item.constKey" :label="item.contractNo" :value="item.contractNo" />
+            <el-option v-for="item in options" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')" :value="item.contractNo" />
           </el-select>
         </el-form-item>
       </el-form>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -55,14 +55,14 @@
 					<!-- 合同编号 -->
 					<el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
 						<el-select filterable @change="changecontract" v-model="dataList.contractNo" placeholder="请输入合同编号" class="typeselect" filterable clearable>
-							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
 								:value="item.contractNo"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
 						<el-input @input="selectTaskNo" v-model="dataList.moveTaskNo" placeholder="请输入移库任务编号"
 							class="typeselect">
-							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
 								:value="item.contractNo"></el-option>
 						</el-input>
 					</el-form-item>
@@ -173,19 +173,19 @@
 					<el-form-item v-if="dataList1.taskTypeKey == 2" label="合同编号">
 						<el-select @change="changecontract1" v-model="dataList1.contractNo" placeholder="请输入合同编号"
 							class="typeselect" filterable clearable>
-							<el-option v-for="item in contractNoList1" :key="item.constKey" :label="item.contractNo"
+							<el-option v-for="item in contractNoList1" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
 								:value="item.contractNo"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item v-if="dataList1.taskTypeKey == 4" label="移库任务编号">
 						<el-select v-model="dataList1.contractNo"  filterable clearable placeholder="请输入移库任务编号" class="typeselect">
-							<el-option v-for="item in contractNoList1" :key="item.constKey" :label="item.contractNo"
+							<el-option v-for="item in contractNoList1" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
 								:value="item.contractNo"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item v-if="dataList1.taskTypeKey == 3" label="移库任务编号">
 						<el-select disabled v-model="dataList1.moveTaskNo" placeholder="请输入移库任务编号" class="typeselect">
-							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
 								:value="item.contractNo"></el-option>
 						</el-select>
 					</el-form-item>
@@ -302,14 +302,14 @@
 					<el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
 						<el-select @change="changecontract" v-model="dataList.contractNo" placeholder="请输入合同编号"
 							class="typeselect" filterable clearable>
-							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
 								:value="item.contractNo"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
 						<el-select @change="selectTaskNo" v-model="dataList.moveTaskNo" placeholder="请输入移库任务编号"
 							class="typeselect" filterable clearable>
-							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
 								:value="item.contractNo"></el-option>
 						</el-select>
 					</el-form-item>

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -150,7 +150,7 @@
               <el-option
                 v-for="item in contractNoList"
                 :key="item.constKey"
-                :label="item.contractNo"
+                :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
                 :value="item.contractNo"
               ></el-option>
             </el-select>
@@ -387,7 +387,7 @@
               <el-option
                 v-for="item in contractNoList"
                 :key="item.constKey"
-                :label="item.contractNo"
+                :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
                 :value="item.contractNo"
               ></el-option>
             </el-select>
@@ -617,7 +617,7 @@
               <el-option
                 v-for="item in contractNoList"
                 :key="item.constKey"
-                :label="item.contractNo"
+                :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
                 :value="item.contractNo"
               ></el-option>
             </el-select>

src/views/warehouse/warehouseManagementDelivery.vue

@@ -66,7 +66,7 @@
                   <ws-option
                     v-for="item in outContractNo"
                     :key="item.constKey"
-                    :label="item.contractNo"
+                    :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
                     :value="item.contractNo"
                   />
                 </ws-select>

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -65,7 +65,7 @@
               <ws-form-item label="合同编号" span="1" prop="contractNo">
                 <el-select disabled filterable clearable :filter-method="dataFilter1" v-model="dataList.contractNo"
                   placeholder="请选择合同编号或移库任务编号" class="typeselect" @change="contractNoChange">
-                  <el-option v-for="item in outContractNo1" :key="item.constKey" :label="item.contractNo"
+                  <el-option v-for="item in outContractNo1" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
                     :value="item.contractNo" />
                 </el-select>
               </ws-form-item>

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -46,7 +46,7 @@
                   <ws-option
                     v-for="item in outContractNo"
                     :key="item.constKey"
-                    :label="item.contractNo"
+                    :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
                     :value="item.contractNo"
                   />
                 </ws-select>

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -249,7 +249,7 @@
                 <ws-option
                   v-for="item in outContractNo"
                   :key="item.constKey"
-                  :label="item.contractNo"
+                  :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
                   :value="item.contractNo"
                 />
               </ws-select>

src/views/warehousenew/goodsrollIn.vue

@@ -20,7 +20,7 @@
             </el-form-item>
             <el-form-item label="合同编号">
                 <el-select filterable clearable @change="contractNochange" v-model="form.outContractNo" placeholder="请选择合同编号">
-                <el-option v-for="item in contractNoList" :key="item.id" :label="item.contractNo" :value="item.contractNo"></el-option>
+                <el-option v-for="item in contractNoList" :key="item.id" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')" :value="item.contractNo"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="客户">

src/views/warehousenew/warehouseManagementGross.vue

@@ -659,7 +659,7 @@
                 <ws-option
                   v-for="item in outContractNo"
                   :key="item.constKey"
-                  :label="item.contractNo"
+                  :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
                   :value="item.contractNo"
                 />
               </ws-select>

src/views/warehousenew/warehouseManagementNoWeightOut.vue

@@ -64,7 +64,7 @@
               <ws-form-item label="合同编号" span="1" prop="contractNo">
                 <ws-select disabled v-model="dataList.contractNo" placeholder="请选择合同编号或移库任务编号" class="typeselect"
                   @change="contractNoChange">
-                  <ws-option v-for="item in outContractNo" :key="item.constKey" :label="item.contractNo"
+                  <ws-option v-for="item in outContractNo" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
                     :value="item.contractNo" />
                 </ws-select>
               </ws-form-item>

src/views/warehousenew/warehouseManagementPerfectput.vue

@@ -47,7 +47,7 @@
                   <el-option
                     v-for="item in options1"
                     :key="item.constKey"
-                    :label="item.contractNo"
+                    :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
                     :value="item.contractNo"
                   />
                 </el-select>

src/views/warehousenew/warehouseManagementPut.vue

@@ -324,7 +324,7 @@
             <!-- 出库合同编号 -->
             <ws-form-item label="出库合同编号" span="1">
               <ws-select v-model="deptBudgetList.outContractNo" placeholder="请选择合同编号或移库任务编号" class="typeselect">
-                <ws-option v-for="item in outContractNo" :key="item.constKey" :label="item.contractNo"
+                <ws-option v-for="item in outContractNo" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
                   :value="item.contractNo" />
               </ws-select>
             </ws-form-item>

src/views/warehousenew/warehouseManagementRecord.vue

@@ -52,6 +52,12 @@
           @change='datechange' type="daterange" align="right" range-separator="至" start-placeholder="出入库日期起"
           end-placeholder="出入库日期止">
         </el-date-picker>
+        <el-select filterable clearable v-model="inOutType" placeholder="请选择出入库类型" class="typeselect"
+            @change="binNumberChange">
+            <el-option key="全部类型" label="全部类型" value="" />
+            <el-option v-for="item in inOutTypeList" :key="item.value" :label="item.value"
+              :value="item.value" />
+          </el-select>
         <ws-input v-model="searchKeyWord" placeholder="可按合同编号、车牌号查找" clearable maxlength="250" type="input"
           class="input">
         </ws-input>
@@ -61,6 +67,7 @@
             src="../../../public/img/sousuo.png" alt />
         </ws-button>
         <el-button type="primary" @click="batchPrint">批量打印</el-button>
+        <el-button type="primary" @click="salesTransfer">销售转移</el-button>
         <el-table show-summary ref="tableData" :data="warehouseList.records" height="570"
           v-show="this.warehouseType== '1'" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
@@ -107,6 +114,16 @@
               <span v-else>{{ scope.$index + 1 }}</span>
             </template>
           </el-table-column>
+          <el-table-column prop="contractNo" label="合同/移库编号" width="180">
+            <template slot-scope="scope">
+              <span style="color: #8890b1">{{ scope.row.contractNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="contractNo" label="任务编号" width="180">
+            <template slot-scope="scope">
+              <span style="color: #8890b1">{{ scope.row.contractNo }}</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="binNumber" label="仓位号" width="60px"> </el-table-column>
           <el-table-column prop="goodsName" label="货名" width="100"> </el-table-column>
           <!-- <el-table-column prop="type" label="类型" width="60px"> </el-table-column> -->
@@ -140,11 +157,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="inOutType" label="类型"> </el-table-column>
-          <el-table-column prop="contractNo" label="合同编号" width="180">
-            <template slot-scope="scope">
-              <span style="color: #8890b1">{{ scope.row.contractNo }}</span>
-            </template>
-          </el-table-column>
+         
           <el-table-column prop="carNo" label="车牌号">
             <template slot-scope="scope">
               <span style="color: #8890b1">{{ scope.row.carNo }}</span>
@@ -298,6 +311,32 @@
       <el-image style="width: 100px; height: 100px" :src="appendixIdss" :preview-src-list="srcList">
       </el-image>
     </WinseaContentModal>
+    <WinseaContentModal v-model="show" title="销售转移"
+      @on-cancel="handleClose">
+      <div>
+        <div style="display:inline-block;" v-for="item in modification">{{ item.carNo }} ({{ item.netWeight }})</div>
+      </div>
+      <div>合计：{{modification.length}}车 {{num}}吨 合同编号：{{currectdata.contractNo}}（{{currectdata.pointOut}}）</div>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item label="转至销售/移库">
+          <el-select v-model="form.region" placeholder="选择转移后的销售合同编号或移库编号">
+            <el-option label="区域一" value="shanghai"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="出入库任务">
+          <el-select v-model="form.region" placeholder="选择转移后的出入库任务编号">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="运输任务（自运必填）">
+          <el-select v-model="form.region" placeholder="选择转移后的运输任务编号">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </WinseaContentModal>
   </div>
 
 </template>
@@ -308,7 +347,8 @@
     addselectinfoList,
     recordss,
     getPrintInfo,
-    getbinnumber
+    getbinnumber,
+    getExpense
   } from '@/model/warehouse/index'
   import {
     downloadFile
@@ -345,7 +385,21 @@
         showType: true,
         // 年
         year: '',
+        show:false,
         srcList: [],
+        currectdata:{},
+        inOutType:'',
+        inOutTypeList:[
+          {value:'货权转入'},
+          {value:'货权转出'},
+          {value:'移库入库'},
+          {value:'采购入库'},
+          {value:'移库出库'},
+          {value:'销售出库'},
+          {value:'折转入库'},
+          {value:'折转出库'},
+          {value:'退库'}],
+        num:0,
         deptBudgetTotal: 0,
         currentPage: 1,
         pageSize: 10,
@@ -405,6 +459,40 @@
       })
     },
     methods: {
+      async salesTransfer(){
+        var arr=[]
+        if (this.modification.length == 0) {
+          this.$message.error("请勾选要转移的条目！")
+        } else {
+          this.num=0
+          for (var i = 0; i < this.modification.length; i++) {
+            if(this.modification[i].inOutType!='销售出库'){
+              this.$message.error("请勾选相同合同编号的销售出库记录！")
+              return
+            }
+            this.num+=Number(this.modification[i].netWeight)
+            if(arr.length==0){
+              arr.push(this.modification[i])
+            }
+            var arr1=arr.filter((item)=>{return item.contractNo==this.modification[i].contractNo})
+            if(arr1.length==0){
+              arr.push(this.modification[i])
+            }
+          }
+          if(arr.length>1){
+            this.$message.error("请勾选相同合同编号的销售出库记录！")
+            return
+          }
+          var contractNo=await getExpense({ contractNo: arr[0].contractNo, compId: this.compId }).toPromise()
+          if(contractNo.status=='已完成'||contractNo.status=='已结算'){
+            this.$message.error("已完成的合同记录不可转移！")
+            return
+          }
+          this.currectdata.contractNo=this.modification[0].contractNo
+          this.currectdata.pointOut=contractNo.pointOut
+          this.show=true
+        }
+      },
       batchPrint() {
         if (this.modification.length == 0) {
           this.$message.error("请勾选要打印的条目！")
@@ -536,6 +624,7 @@
     		},
 			handleClose() {
 				this.accessoryTFs = false
+        this.show=true
 			},
 			handleSizeChange(val) {
 				console.log(`每页 ${val} 条`)
@@ -583,7 +672,8 @@
 							positionId: this.deptBudgetList.positionId,
 							warehouseName: this.deptBudgetList.warehouseName,
 							startDate:startDate,
-       					    endDate:endDate,
+       				endDate:endDate,
+              inOutType:this.inOutType,
 							searchType: this.searchType,
 							searchKeyWord: this.searchKeyWord,
 							currentPage: this.currentPage,

src/views/warehousenew/warehousingOrder.vue

@@ -501,7 +501,7 @@
         <el-form :inline="true" label-width="120px" class="demo-form-inline">
           <el-form-item label="合同编号">
             <el-select clearable filterable @change="contractNochange" v-model="rolloutData.outContractNo" placeholder="选择合同编号">
-              <el-option v-for="item in contractNoList" :key="item.contractNo" :label="item.contractNo" :value="item.contractNo"></el-option>
+              <el-option v-for="item in contractNoList" :key="item.contractNo" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')" :value="item.contractNo"></el-option>
             </el-select>
           </el-form-item>
         </el-form>
@@ -1044,7 +1044,7 @@ export default {
         for (let i = 0; i < array.length; i++) {
           if(array[i].amountEdPayable == 0 && !array[i].approveStatus&&array[i].redeemFlag!='赎'||array[i].amountEdPayable == array[i].grainFund && !array[i].approveStatus&&array[i].redeemFlag!='赎'){
             arr.push(array[i])
-          }else if(rray[i].redeemFlag=='赎'){
+          }else if(array[i].redeemFlag=='赎'){
             this.$message.error('请选择未货权转出的条目！')
             return
           }else{
@@ -1075,7 +1075,6 @@ export default {
       for (let item of arr) {
         map.set(item.goodsName, item);
       }
-
       var data = [...map.values()];
       if (data.length > 1) {
         this.$message({