Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

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/api/V2/profitable/index.js

@@ -116,9 +116,13 @@ export const API_IMPORT_FIXED ='/fixedAssetsInfo/api/importFixedAssets'
 export const API_GET_COALPARAGRAPH = '/coalPaymentInfo/selectCoalInfo'
 //煤款记录
 export const API_GET_COALPARAGRAPH_RECORD = '/expenseInfo/selectRequestRecordInfo'
+//导出
+export const API_GET_EXPORT_TEXT = '/contractManagementInfo/settlementExport'
+//查看附件
+export const API_GET_LOOK_ANNEX = '/appendix/query/getFileList'
 //备用金列表
 export const API_GET_PETTCASHLIST = '/expenseInfo/selectPettyCashInfo'
 //备用金账户列表
 export const API_GET_PETTACCOUNTLIST = '/pettyCashInfo/selectPettyAccountInfo'
 //备用金账户下拉列表
-export const API_GET_GETACCOUNTLIST = '/pettyCashInfo/getPettyAccountList'
+export const API_GET_GETACCOUNTLIST = '/pettyCashInfo/getPettyAccountList'

src/api/V2/warehouse/index.js

@@ -191,3 +191,5 @@ export const API_GET_LOOKMATERIAL='/materialWarehouseInOut/getMaterialInfo'
 export const API_GET_GETQUALITYZHE = '/warehouseBaseInfo/getQuantityZhe'
 //实际重量
 export const API_GET_GETQUALITYREAL = '/warehouseBaseInfo/getQuantityReal'
+//销售转移
+export const API_SALESTRANINFO = '/salesTransferInfo/api/salesTransfer'

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/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/model/profitable/index.js

@@ -59,6 +59,8 @@ import {
   API_POST_UPLOADIMAGE,
   API_GET_COALPARAGRAPH,
   API_GET_COALPARAGRAPH_RECORD,
+  API_GET_EXPORT_TEXT,
+  API_GET_LOOK_ANNEX,
   API_GET_PETTCASHLIST,
   API_GET_PETTACCOUNTLIST,
   API_GET_GETACCOUNTLIST
@@ -180,6 +182,10 @@ export const importFixed = appRx.post(API_IMPORT_FIXED, errorCatcher, errorHandl
 export const coalPayment = appRx.get(API_GET_COALPARAGRAPH, errorCatcher, errorHandle, filter)
 // 煤款记录
 export const coalPaymentRecord = appRx.get(API_GET_COALPARAGRAPH_RECORD, errorCatcher, errorHandle, filter)
+// 导出
+export const exportText = appRx.get(API_GET_EXPORT_TEXT)
+//查看附件
+export const getAnnex = appRx.get(API_GET_LOOK_ANNEX, errorCatcher, errorHandle, filter)
 // 备用金列表
 export const pettCashList = appRx.get(API_GET_PETTCASHLIST, errorCatcher, errorHandle, filter)
 // 备用金账户列表

src/model/warehouse/index.js

@@ -92,7 +92,8 @@ import {
     API_POST_DELMATERIAL,
     API_GET_LOOKMATERIAL,
     API_GET_GETQUALITYZHE,
-    API_GET_GETQUALITYREAL
+    API_GET_GETQUALITYREAL,
+    API_SALESTRANINFO
     // API_GET_EXPENSEINFO
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
@@ -284,3 +285,5 @@ export const lookMaterial = appRx.get(API_GET_LOOKMATERIAL, errorCatcher, errorH
 export const getQualityZhe = appRx.get(API_GET_GETQUALITYZHE, errorCatcher, errorHandle, filter)
 //实际重量
 export const getQualityReal = appRx.get(API_GET_GETQUALITYREAL, errorCatcher, errorHandle, filter)
+//销售转移
+export const salestraninfo = appRx.post(API_SALESTRANINFO, errorCatcher, errorHandle, filter)

src/views/contractManagement/acquisitionContract.vue

@@ -191,14 +191,14 @@
             <el-link v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`
             " target="_blank" type="primary" :underline="false" @click="handleEdit(scope.row)"
-              :disabled="scope.row.approveStatus">编辑</el-link>
+              :disabled="scope.row.approveStatus&& scope.row.approveStatus!='发起人撤回'">编辑</el-link>
               <el-dropdown>
               <span class="btn_css">•••</span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             "><el-link target="_blank" type="primary" :underline="false" @click="handleDelete(scope.row)"
-              :disabled="scope.row.approveStatus">删除</el-link>
+              :disabled="scope.row.approveStatus&& scope.row.approveStatus!='发起人撤回'">删除</el-link>
                 </el-dropdown-item>
                 <el-dropdown-item v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`

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/collectionContract.vue

@@ -121,14 +121,14 @@
             <el-link v-hasPermission="
               `contractManagement.dsContract.dsContractInfo.edit`
             " target="_blank" type="primary" :underline="false" @click="handleEdit(scope.row)"
-              :disabled="scope.row.approveStatus">编辑</el-link>
+              :disabled="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'">编辑</el-link>
               <el-dropdown>
               <span class="btn_css">•••</span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-hasPermission="
               `contractManagement.dsContract.dsContractInfo.delete`
             "><el-link target="_blank" type="primary" :underline="false" @click="handleDelete(scope.row)"
-              :disabled="scope.row.approveStatus">删除</el-link>
+              :disabled="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'">删除</el-link>
                 </el-dropdown-item>
                 <el-dropdown-item v-hasPermission="
               `contractManagement.dsContract.dsContractInfo.edit`

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/purchaseContract.vue

@@ -211,14 +211,14 @@
             <el-link v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`
             " target="_blank" type="primary" :underline="false" @click="handleEdit(scope.row)"
-              :disabled="(scope.row.approveStatus!=null)">编辑</el-link>
+              :disabled="(scope.row.approveStatus!=null && scope.row.approveStatus!='发起人撤回')">编辑</el-link>
               <el-dropdown>
               <span class="btn_css">•••</span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             "><el-link target="_blank" type="primary" :underline="false" @click="handleDelete(scope.row)"
-              :disabled="(scope.row.approveStatus!=null)">删除</el-link>
+              :disabled="(scope.row.approveStatus!=null && scope.row.approveStatus!='发起人撤回')">删除</el-link>
                 </el-dropdown-item>
                 <el-dropdown-item v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`

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/salesContract.vue

@@ -228,14 +228,14 @@
             <el-link v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.edit`
             " target="_blank" type="primary" :underline="false" @click="handleEdit(scope.row)"
-              :disabled="scope.row.approveStatus">编辑</el-link>
+              :disabled="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'">编辑</el-link>
               <el-dropdown>
               <span class="btn_css">•••</span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.delete`
             "><el-link target="_blank" type="primary" :underline="false" @click="handleDelete(scope.row)"
-              :disabled="scope.row.approveStatus">删除</el-link>
+              :disabled="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" >删除</el-link>
                 </el-dropdown-item>
                 <el-dropdown-item v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.edit`

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/storageContract.vue

@@ -122,14 +122,14 @@
             <el-link v-hasPermission="
               `contractManagement.dcContract.dcContractInfo.edit`
             " target="_blank" type="primary" :underline="false" @click="handleEdit(scope.row)"
-              :disabled="scope.row.approveStatus">编辑</el-link>
+              :disabled="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'">编辑</el-link>
               <el-dropdown>
               <span class="btn_css">•••</span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-hasPermission="
               `contractManagement.dcContract.dcContractInfo.delete`
             "><el-link target="_blank" type="primary" :underline="false" @click="handleDelete(scope.row)"
-              :disabled="scope.row.approveStatus">删除</el-link>
+              :disabled="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'">删除</el-link>
                 </el-dropdown-item>
                 <el-dropdown-item v-hasPermission="
               `contractManagement.dcContract.dcContractInfo.edit`

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/home/right-top.vue

@@ -31,7 +31,7 @@ export default {
     };
   },
   watch:{
-    crklistData(res){debugger
+    crklistData(res){
       console.log('rightyop')
       console.log(res)
       this.pageflag = true;

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -241,12 +241,13 @@
                     size="small" />
                 </ws-form-item>
                 <ws-form-item v-if='serviceManagementType == 1' label="成本（元/吨）" span="1" prop="cost">
-                  <ws-input v-model="deptBudgetList.cost" placeholder="自动获取，不可编辑" maxlength="100" size="small" />
-                  <img width="17" height="18" style="
+                <ws-input v-model="deptBudgetList.cost" v-if="deptBudgetList.inOutType == '退库' " placeholder="自动获取，不可编辑" maxlength="100" size="small" disabled />
+                  <ws-input v-model="deptBudgetList.cost" v-else placeholder="自动获取，不可编辑" maxlength="100" size="small" />
+                  <!-- <img width="17" height="18" style="
                       vertical-align: text-top;
                       position: relative;
                       top: -1px;
-                    " src="../../../public/img/edit.png" @click="editClick(1)" alt="" />
+                    " src="../../../public/img/edit.png" @click="editClick(1)" alt="" /> -->
                 </ws-form-item>
                 <ws-form-item v-if='serviceManagementType == 1' label="提示" span="1" prop="tips">
                   <ws-input v-model="deptBudgetList.tips" placeholder="自动获取，不可编辑" maxlength="100" disabled
@@ -942,7 +943,6 @@ export default {
         }
 
       }
-
     },
     deductionchange() {
       if (this.deptBudgetList.type == '潮粮') {
@@ -3961,14 +3961,20 @@ export default {
         }
         this.deptBudgetList.inOutTypeKey = 6
       }
-      this.cost = this.outContractNo.contractPrice
-      if (this.cost) {
-        this.isGetCost = true
-        this.deptBudgetList.cost = this.cost - this.deptBudgetList.deductionAmount
-      } else {
-        this.isGetCost = false
-        this.deptBudgetList.cost = this.deptBudgetList.cost
+      if(this.outContractNo.contractPrice){
+          this.cost = this.outContractNo.contractPrice
+          if (this.cost) {
+            this.isGetCost = true
+            this.deptBudgetList.cost = this.cost - this.deptBudgetList.deductionAmount
+          } else {
+            this.isGetCost = false
+            this.deptBudgetList.cost = this.deptBudgetList.cost
+          }
+      }
+      else{
+        this.deptBudgetList.cost =''
       }
+      
       this.deptBudgetList.inOutType = this.outContractNo.inOutType
       if (this.outContractNo.inOutType == '移库入库') {
         this.isSelectType = true

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/profitable/cashoutedit.vue

@@ -492,6 +492,8 @@
             response.type='非粮款'
           }else if(response.costType==5){
             response.type='保证金'
+          }else if(response.costType==7){
+            response.type='利息'
           }
           if(response.paymentIdentifi == 1){
             this.selected = true

src/views/profitable/contractprofitsdetails.vue

@@ -87,12 +87,13 @@
           </el-table-column>
           <el-table-column width="80" prop="status" label="状态"></el-table-column>
           <el-table-column width="100" prop="signingDate" label="签订日期"></el-table-column>
-          <el-table-column prop="address" label="操作" width="300">
+          <el-table-column prop="address" label="操作" width="350">
             <template slot-scope="scope">
               <el-button v-if="scope.row.status=='已结算'" @click="finalstatement(scope.row)" type="primary">结算单</el-button>
               <el-button v-if="scope.row.status=='已完成'" @click="closeaccount(scope.row)" type="primary">结算</el-button>
               <el-button @click="inventory(scope.row)" type="primary">库存</el-button>
               <el-button @click="cost(scope.row)" type="primary">费用</el-button>
+              <el-button @click="exportText(scope.row)" type="primary" v-if="scope.row.status == '已结算'">导出</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -134,10 +135,7 @@
             <td class="col">{{tableData.seller}}</td>
           </tr>
           <tr class="row">
-            <td class="col col-bgc"> 
-              <span v-if="tableData.agreementType == '采购合同'">采购</span>
-              <span v-if="tableData.agreementType == '收购合同'">收购</span>
-              <span v-if="tableData.agreementType == '销售合同'">销售</span>结算单价（元/吨）</td>
+            <td class="col col-bgc">结算单价（元/吨）</td>
             <td class="col">{{tableData.settlementPrice}}</td>
             <td class="col col-bgc">合计利润（元）</td>
             <td class="col">{{tableData.profit}}</td>
@@ -149,11 +147,7 @@
             <td class="col col-bgc">利润（元）</td>
           </tr>
           <tr v-for="item in tableData.contractList" class="row">
-            <td class="col">{{item.contractNo}}
-              <span v-if="item.agreementType == '采购合同'">(采购)</span>
-              <span v-if="item.agreementType == '收购合同'">(收购)</span>
-              <span v-if="item.agreementType == '销售合同'">(销售)</span>
-            </td>
+            <td class="col">{{item.contractNo}}</td>
             <td class="col">{{item.settlementPrice}}</td>
             <td class="col">{{item.weight}}</td>
             <td class="col">{{item.profit}}</td>
@@ -161,6 +155,20 @@
         </table>
     </div>
 </el-dialog>
+<el-dialog title="导出" :visible.sync="exportShow" width="500px" :before-close="exportClose" :show-close="true">
+      <div class="check">
+        <el-checkbox-group v-model="checkList" @change="checkChange">
+          <el-checkbox label="合同附件" :disabled="contract"></el-checkbox>
+          <el-checkbox label="发运记录"></el-checkbox>
+          <el-checkbox label="费用记录"></el-checkbox>
+          <el-checkbox label="结算单"></el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="exportClose">取 消</el-button>
+        <el-button type="primary" @click="exportSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -168,8 +176,13 @@
     getcontractdetails,
     getrelationcontract,
     editcontract,
-    judgesettlement
+    judgesettlement,
+    exportText,
+  getAnnex
   } from '@/model/profitable/index'
+  import {
+  downloadFile
+} from '@/utils/batchDown'
   export default {
     components: {},
     data() {
@@ -195,6 +208,10 @@
         tableData:{},
         datalist:{},
         compId:localStorage.getItem('ws-pf_compId'),
+        exportShow: false,//导出
+      checkList: [],
+      exportObj: {},
+      contract: false,
       }
     },
     activated() {
@@ -206,6 +223,66 @@
       this.getPassYearFormatDate()
     },
     methods: {
+      async exportSubmit() {
+      const {
+        data
+      } = await exportText(
+        this.exportObj, {}, {
+        responseType: 'blob',
+      }
+      ).toPromise()
+      downloadFile({
+        res: data,
+        fileName: this.exportObj.contractNo + `结算详情`,
+        type: 'doc',
+      })
+      this.exportShow = false
+      this.checkList = []
+      this.exportObj = {}
+    },
+    exportText(row) {//导出
+      this.exportObj.contractNo = row.contractNo
+      if (row.addressUrl) {//查看附件后返回后端
+        getAnnex({
+          appendixIds: row.addressUrl,
+        }).toPromise().then(res => {
+          let arr = []
+          if (res.length > 0) {
+            for (let i = 0; i < res.length; i++) {
+              arr.push(res[i].appendixPath)
+            }
+          }
+          if (arr.length > 0) {
+            this.exportObj.addressUrl = arr.toString()
+          } else {//合同附件为空不让勾选
+            this.contract = true
+          }
+        })
+      }
+      this.exportShow = true
+    },
+    checkChange(e) {
+      for (let i = 0; i < this.checkList.length; i++) {
+        switch (this.checkList[i]) {
+          case '合同附件':
+            this.exportObj.needContractUrl = 1
+            break
+          case '发运记录':
+            this.exportObj.shippingRecord = 1
+            break
+          case '费用记录':
+            this.exportObj.expenseRecord = 1
+            break
+          case '结算单':
+            this.exportObj.needSettlementUrl = 1
+            break
+        }
+      }
+    },
+    exportClose() {
+      this.checkList = []
+      this.exportShow = false
+    },
       handleClose(){
         this.correlationshow=false
       },
@@ -493,4 +570,7 @@
   .el-icon-connection{
     color:#409eff;
   }
+  .check {
+  text-align: center;
+}
 </style>

src/views/profitable/expensemanagementdetails.vue

@@ -429,6 +429,9 @@ export default {
     }
   },
   activated() {
+    if(this.$route.query.id){//有id证从任务页面进来的  将筛选状态变成待付款
+      this.toExamineType = "2"
+    }
     this.getPassYearFormatDate()
     if(this.$route.query.contractNo){
         this.flowTo=this.$route.query.contractNo
@@ -580,7 +583,6 @@ export default {
         })
     },
     getList1() {
-      console.log(this.toExamineType)
       this.currentPage = 1
       this.getList()
     },

src/views/profitable/expensemanagentedit.vue

@@ -195,7 +195,7 @@
         </ws-select>
         <span style="margin-top:5px;margin-left: 10px" v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>  
         </div>
-        <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==7&&mode!="暂不分配"||deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"||deptBudgetList.expensesPurpose==2&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
+        <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="利息"&&mode!="暂不分配"||deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"||deptBudgetList.expensesPurpose==2&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
           <el-table-column key="1" width="150" v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
             <template slot-scope="scope">
               <el-select v-model="scope.row.warehouseName" placeholder="选择仓库" @change="((value)=>{selectware(value, scope.$index)})">
@@ -962,9 +962,10 @@ weight: 4000}]],
             response.type='非粮款'
           }else if(response.costType==5){
             response.type='保证金'
+          }else if(response.costType==7){
+            response.type='利息'
           }
           this.deptBudgetList=response
-          // this.feeDetailsDistributions = this.deptBudgetList.expenseAllocationInfoList
           this.dataList=[]
           if(response.addressUrl){
             var arr=[]
@@ -975,11 +976,10 @@ weight: 4000}]],
             }
             this.paymentScreenshot=srcs
           }
-          if(localStorage.getItem('expensebh')){
+          if(!localStorage.getItem('expensebh')){
             if(this.deptBudgetList.expensesPurpose==3||this.deptBudgetList.expensesPurpose==1||this.deptBudgetList.expensesPurpose==2){
               this.getgoodsourcelist()
             }
-          //   console.log(this.feeDetailsDistributions)
           }
         })
       },

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/statisticalReport/autoSettlementList.vue

@@ -33,7 +33,7 @@
             <el-option v-for="item in warehouseList1" :key="item.id" :label="item.warehouseName" :value="item.warehouseName" style="color: #8890b1" />
           </el-select>
           <el-select  v-model="carType" filterable placeholder="" @change="carTypeChange" >
-            <el-option key="全部" label="全部" value="" style="color: #8890b1" />
+            <el-option key="全部装卸状态" label="全部装卸状态" value="" style="color: #8890b1" />
             <el-option key="未卸车" label="未卸车" value="1" style="color: #8890b1" />
             <el-option key="已卸车" label="已卸车" value="2" style="color: #8890b1" />
           </el-select>

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/tranManagement/tranManagementReceivingloading.vue

@@ -236,22 +236,30 @@
                   size="small"
                 />
               </ws-form-item>
+               <!--装车日期-->
+              <ws-form-item
+                label="装车日期："
+                span="1"
+                prop="loadingDate"
+                style="width: 200px"
+                >{{ item.loadingDate }}</ws-form-item
+              >
               <!--卸车日期-->
               <ws-form-item
                 label="卸车日期:"
                 span="1"
-                prop="receiveDateEnd"
+                prop="unloadingDate"
                 style="width: 340px"
               >
                 <ws-date-picker
-                  v-model="item.receiveDateEnd"
+                  v-model="item.unloadingDate"
                   v-if="item.status == '已送达' || item.status == '未装车'"
                   :disabled="readonly"
                   type="date"
                   value-format="yyyy-MM-dd"
                 />
                 <ws-date-picker
-                  v-model="item.receiveDateEnd"
+                  v-model="item.unloadingDate"
                   v-else
                   type="date"
                   placeholder="请选择日期"
@@ -548,7 +556,7 @@ export default {
             obj.driverPhone = v.司机电话
             obj.driver = v.司机姓名
             obj.unloadNetWeight = v.卸车净重
-            obj.receiveDateEnd = v.卸车日期
+            obj.unloadingDate = v.卸车日期
             obj.status = v.状态
             obj.carNo = v.车牌号
             obj.unloadPoundImg = v.磅单

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -132,10 +132,10 @@
                 size="small" />
             </ws-form-item>
             <!--装车日期-->
-            <ws-form-item label="装车日期:" span="1" prop="sendDateStart">
+            <ws-form-item label="装车日期:" span="1" prop="loadingDate">
               <ws-date-picker v-if="item.status == '已装车'||item.status == '已送达'" :disabled="readonly"
-                v-model="item.sendDateStart" type="date" class="picker" placeholder="请选择日期" value-format="yyyy-MM-dd" />
-              <ws-date-picker v-else v-model="item.sendDateStart" type="date" class="picker" placeholder="请选择日期"
+                v-model="item.loadingDate" type="date" class="picker" placeholder="请选择日期" value-format="yyyy-MM-dd" />
+              <ws-date-picker v-else v-model="item.loadingDate" type="date" class="picker" placeholder="请选择日期"
                 value-format="yyyy-MM-dd" />
             </ws-form-item>
             <!--磅单-->
@@ -434,7 +434,7 @@
               obj.driverPhone = v.司机电话
               obj.driver = v.姓名
               obj.loadNetWeight = v.装车净重
-              obj.sendDateStart = v.装车日期
+              obj.loadingDate = v.装车日期
               obj.status = v.状态
               obj.carNo = v.车牌号
               obj.loadPoundImg = v.磅单

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

@@ -11,7 +11,7 @@
     </el-row>
     <div class="center">
       <div style="width:49%;display:inline-block;">
-        <el-form ref="form" :model="form" label-width="200px">
+        <el-form ref="form" :model="form" label-width="160px">
             <el-form-item label="关联货权转出记录">
                 <el-select filterable clearable @change="receiveNochange" v-model="form.relationReceiveNo" placeholder="选择关联货权">
                     <el-option label="不关联" value="不关联"></el-option>
@@ -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="客户">
@@ -60,19 +60,19 @@
                 </el-select>
             </el-form-item>
         </el-form>
-        <el-form :inline="true" label-width="200px" v-for="(item,index) in form.cargoPositionDetailsList" :key="'cangwe'+index" class="demo-form-inline">
-          <el-form-item :label="'仓位-'+(index+1)">
+        <el-form :inline="true"  v-for="(item,index) in form.cargoPositionDetailsList" :key="'cangwe'+index" class="demo-form-inline">
+          <el-form-item label-width="160px" :label="'仓位-'+(index+1)">
             <el-select @focus="binNumberfocus" clearable filterable @change="($event)=>binNumberchange($event,item,index)" v-model="item.binNumber" placeholder="选择仓位">
               <el-option v-for="item1 in binNumberList" :label="item1.binNumber" :value="item1.binNumber"></el-option>
             </el-select>
           </el-form-item> 
-          <el-form-item label="入库重量（吨）">
+          <el-form-item label-width="170px" label="入库重量（吨）">
             <el-input @input="weightinput" v-model="item.weight" placeholder="输入该仓位出库重量"></el-input>
           </el-form-item>
           <img width="22" height="22" class="add" @click="add" src="../../../public/img/add.png" alt="" />
           <img width="22" height="22" class="del" @click="del(index)" src="../../../public/img/del.png" alt="" />
         </el-form>
-        <el-form label-width="200px">
+        <el-form label-width="160px">
             <el-form-item label="合计重量">
                 <el-input disabled v-model="form.transferOutWeight" placeholder="自动计算，不可编辑"></el-input>
             </el-form-item>
@@ -488,6 +488,7 @@ import {xialaNo} from '@/model/tasksport/index'
   }
   /deep/.el-form.el-form--inline .el-form-item{
       margin:0;
+      width:48%;
 }
 .add,.del{
       position:absolute;

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.inOutTaskNo }}</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>
@@ -174,6 +187,9 @@
               <span v-if='scope.row.inOutFlag==1'>{{ scope.row.backOffice }}</span>
             </template>
           </el-table-column>
+          <el-table-column prop="salesTransferStatus" label="销售转移状态">
+          </el-table-column>
+          
           <el-table-column prop="addressUrl" label="操作" width="100px">
             <template slot-scope="scope">
               <!-- <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
@@ -298,6 +314,34 @@
       <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 label-position="left" class="sale-form" ref="form" :model="currectdata" label-width="160px">
+        <el-form-item label="出入库任务">
+          <el-select @change="taskNochange" v-model="currectdata.taskNoNew" placeholder="选择转移后的出入库任务编号">
+            <el-option v-for="item in taskNolist" :key="item.id" :label="item.inOutTaskNo+(item.taskFlag?'（'+item.taskFlag+'）':'')" :value="item.inOutTaskNo"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="转至销售/移库">
+          <el-input disabled v-model="currectdata.contractNoNew" placeholder="选择转移后的销售合同编号或移库编号"></el-input>
+        </el-form-item>
+        <el-form-item label="运输任务（自运必填）">
+          <!-- <el-input disabled v-model="currectdata.tranTaskNew" placeholder="选择转移后的运输任务编号"></el-input> -->
+          <el-select :disabled="this.contractNo.deliverType==2" v-model="currectdata.tranTaskNew" placeholder="选择转移后的运输任务编号">
+            <el-option  v-for="item in taskInfo" :label="item.taskNo" :value="item.taskNo"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="show=false">取消</el-button>
+          <el-button type="primary" @click="onSubmit">提交</el-button>
+        </el-form-item>
+      </el-form>
+    </WinseaContentModal>
   </div>
 
 </template>
@@ -308,11 +352,21 @@
     addselectinfoList,
     recordss,
     getPrintInfo,
-    getbinnumber
+    getbinnumber,
+    getExpense,
+    getReceiptTaskNo,
+    salestraninfo
   } from '@/model/warehouse/index'
   import {
     downloadFile
   } from '@/utils/batchDown'
+  import {
+    getcontract
+  } from '@/model/outboundManagement/index'
+  import {
+    getYunShuXiaLa,
+    getYunShuNumber,
+  } from '@/model/statisticalReport/index'
   import Pagination from '@/components/Pagination'
   import WsUpload from '@/components/WsUpload'
   import {
@@ -345,7 +399,26 @@
         showType: true,
         // 年
         year: '',
+        form:{},
+        contractNo:{},
+        show:false,
         srcList: [],
+        currectdata:{
+          compId: localStorage.getItem('ws-pf_compId'),
+        },
+        inOutType:'',
+        inOutTypeList:[
+          {value:'货权转入'},
+          {value:'货权转出'},
+          {value:'移库入库'},
+          {value:'采购入库'},
+          {value:'移库出库'},
+          {value:'销售出库'},
+          {value:'折转入库'},
+          {value:'折转出库'},
+          {value:'退库'}],
+        num:0,
+        taskInfo:[],
         deptBudgetTotal: 0,
         currentPage: 1,
         pageSize: 10,
@@ -372,6 +445,7 @@
           month: dayjs().format('MM'),
         },
         warehouseList: [],
+        taskNolist:[],
         deptBudgetList: {},
         historyList: [],
         searchType: '',
@@ -401,10 +475,91 @@
     },
     updated() {
       this.$nextTick(() => {
-        this.$refs['tableData'].doLayout();
+        // this.$refs['tableData'].doLayout();
       })
     },
     methods: {
+      onSubmit(){
+        if(!this.currectdata.taskNoNew){
+          this.$message.error("合同/移库编号不能为空！")
+          return
+        }
+        if(!this.currectdata.contractNoNew){
+          this.$message.error("出入库任务编号不能为空！")
+          return
+        }
+        this.$confirm('确定转移出库数据？', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+        .then(() => {
+          salestraninfo(this.currectdata).toPromise().then(() => {
+            this.show=false
+            this.currectdata={
+                compId: localStorage.getItem('ws-pf_compId'),
+              }
+              this.$message.success("提交成功！")
+              this.getList()
+          })
+        })
+      },
+      async taskNochange(e){
+        for (let i = 0; i < this.taskNolist.length; i++) {
+          if(this.taskNolist[i].inOutTaskNo==e){
+            this.currectdata.contractNoNew=this.taskNolist[i].contractNo?this.taskNolist[i].contractNo:this.taskNolist[i].moveTaskNo
+          }
+        }
+        this.contractNo=await getcontract({contractNo:this.currectdata.contractNoNew,warehouseName:this.warehouseName,compId:localStorage.getItem('ws-pf_compId')}).toPromise()
+        this.currectdata.pointOutNew=this.contractNo.pointOut
+        var data=await getYunShuNumber({contractNo:this.currectdata.contractNoNew}).toPromise()
+        this.currectdata.tranTaskNew=data[0].taskNo
+        this.taskInfo=data
+        console.log(this.taskinfo)
+      },
+      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.warehouseInOutInfoList=this.modification
+          
+          let map = new Map();
+          for (let item of this.modification) {
+            map.set(item.inOutTaskNo, item.inOutTaskNo);
+          }
+          var arr = [...map.values()]
+          console.log(arr)
+          this.currectdata.taskNo=arr.toString()
+          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 +691,7 @@
     		},
 			handleClose() {
 				this.accessoryTFs = false
+        this.show=true
 			},
 			handleSizeChange(val) {
 				console.log(`每页 ${val} 条`)
@@ -583,7 +739,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,
@@ -636,6 +793,15 @@
 							this.warehouseList = response
 						})
 				}
+        getReceiptTaskNo({
+            flag: 1,
+            warehouseName: this.deptBudgetList.warehouseName,
+            agentKey: localStorage.getItem('ws-pf_userId'),
+          })
+          .toPromise()
+          .then((response) => {
+            this.taskNolist = response
+          })
 
 			},
 			selecttaskType(e) {
@@ -944,10 +1110,6 @@
     padding: 0 1%;
   }
 
-  .el-form-item {
-    width: 50%;
-  }
-
   .el-form-item__label {
     text-align: center;
   }
@@ -1118,4 +1280,18 @@
     font-size: 18px;
     margin-left: 20px;
   }
+  /deep/.sale-form .el-select{
+    width:100%;
+  }
+  /deep/.winsea__content-modal .winsea__content-modal__win-wrap {
+    width:50%;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    height: 410px;
+    border-radius: 10px;
+  }
 </style>

src/views/warehousenew/warehousingOrder.vue

@@ -58,6 +58,8 @@
         <ws-button :type="searchType === '2' ? 'primary' : ''" @click="handle('2')" v-hasPermission="
         `warehouseManagement.warehousingOrder.View`">待审核
         </ws-button>
+        <el-checkbox @change="chaeckedchange" v-model="checked"></el-checkbox>
+        <span v-if="checked">合计剩余：{{tabletotal}}吨</span>
       </el-col>
       <el-col style='text-align:right;' :span="12">
         <!-- <ws-button v-hasPermission="
@@ -482,12 +484,12 @@
     <el-dialog width='30%' :visible.sync="remarkList" title="备注" top="20vh">
       <span>{{ remark }}</span>
     </el-dialog>
-    <el-dialog width='50%' :visible.sync="rolloutShow" title="货权转出" top="20vh">
+    <el-dialog width='60%' :visible.sync="rolloutShow" title="货权转出" top="20vh">
       <div class="form-inline">
         <div style="margin:10px;">
           选中{{ rolloutData.warehousingOrderList.length }}条：{{rolloutData.warehouseName}}&nbsp;转出&nbsp;{{ rolloutData.goodsName }}&nbsp;
           {{ rolloutData.transferOutWeight }}吨&nbsp;应付{{rolloutData.amountIngPayable}}&nbsp; 已付{{rolloutData.amountEdPayable}}&nbsp; 
-          未付{{rolloutData.amountNotPayable}}&nbsp; 平均成本 {{ rolloutData.avgCost }}
+          未付{{rolloutData.amountNotPayable}}&nbsp; 平均成本 {{ rolloutData.avgCost }} 本次转出重量（吨）：<el-input style="width:200px;" v-model="rolloutData.transferOutWeight1" placeholder="输入本次转出重量"></el-input>
         </div>
         <el-form :inline="true" label-width="120px" class="demo-form-inline">
           <el-form-item label="售价（元/吨）">
@@ -501,7 +503,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>
@@ -668,6 +670,7 @@ export default {
       dataList: [],
       payeeinfo: [],
       title1:'',
+      checked:false,
       StartDate:'',
       EndDate:'',
       rejectshow:false,
@@ -678,6 +681,7 @@ export default {
         warehouseName:'',
         goodsName:'',
         transferOutWeight:0,
+        transferOutWeight1:0,
         amountEdPayable:0,
         amountNotPayable:0,
         amountIngPayable:0,
@@ -835,6 +839,7 @@ export default {
       remark: '',
       baseId:'',
       auditMind:'',
+      tabletotal:0,
       contractNoList:[],
       binNumberList:[],
     }
@@ -860,6 +865,23 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    chaeckedchange(e){
+      console.log(e)
+        this.tabletotal=0
+        for (let i = 0; i < this.gainList.length; i++) {
+          var item=this.gainList[i]
+          if(e){
+            for (let q = 0; q < item.warehousingOrderList.length; q++) {
+              this.tabletotal+=Number(item.warehousingOrderList[q].surplusWeight)
+            }
+          }
+          this.$refs[`multipleTable${i}`][0].toggleAllSelection();
+        }
+        this.tabletotal=this.tabletotal.toFixed(3)
+      
+      
+      // 
+    },
     weightinput(e){
       this.rollweight=0
       for (let i = 0; i < this.rolloutData.cargoPositionDetailsList.length; i++) {
@@ -953,11 +975,12 @@ export default {
           return
         }
       }
-      if(this.rollweight!=this.rolloutData.transferOutWeight){
+      console.log(this.rolloutData.transferOutWeight1)
+      if(Number(this.rollweight)!=this.rolloutData.transferOutWeight1){
         this.$message.error('输入的出库重量合计须等于勾选的重量合计！')
         return
       }
-      
+      this.rolloutData.transferOutWeight=this.rolloutData.transferOutWeight1
       this.$confirm('提交后不可修改，确定转出货权？', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -1027,7 +1050,6 @@ export default {
       this.$forceUpdate()
     },
     async goodrollOut(){
-      console.log(11111111111111)
       var concatarr=[]
       var arr=[]
       var arr3=[]
@@ -1075,7 +1097,6 @@ export default {
       for (let item of arr) {
         map.set(item.goodsName, item);
       }
-
       var data = [...map.values()];
       if (data.length > 1) {
         this.$message({
@@ -1116,6 +1137,7 @@ export default {
         num+=(Number(arr[i].surplusWeight*arr[i].avgCost))
       }
       this.rolloutData.transferOutWeight= this.rolloutData.transferOutWeight.toFixed(3)
+      this.$set(this.rolloutData,'transferOutWeight1',this.rolloutData.transferOutWeight)
       this.rolloutData.avgCost=(num/this.rolloutData.transferOutWeight).toFixed(3)
       this.rolloutData.amountEdPayable=this.rolloutData.amountEdPayable.toFixed(3)
       this.rolloutData.amountNotPayable=this.rolloutData.amountNotPayable.toFixed(3)