前端

package.json

@@ -83,6 +83,7 @@
     "vue-amap": "^0.5.10",
     "vue-i18n": "7.3.2",
     "vue-pdf": "^4.2.0",
+    "pdfjs-dist": "^2.6.347",
     "vue-print-nb": "^1.7.5",
     "vue-router": "3.0.2",
     "vue-seamless-scroll": "^1.1.17",

src/views/personnelManagement/carNoList.vue

@@ -70,6 +70,7 @@
         show:false,
         recordList:[],
         compId:localStorage.getItem('ws-pf_compId'),
+       
       }
     },
     activated() {

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

@@ -59,22 +59,22 @@ const checkWorkListRouter = {
             },
             // 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
-        },
+        // {
+        //     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,141 +1,141 @@
 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: [
 
         // 粮商审核
-        // {
-        //     path: 'grainmerchantreview',
-        //     component: () =>
-        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainmerchantreview'),
-        //     name: 'grainmerchantreview',
-        //     meta: {
-        //         title: 'grainmerchantreview',
-        //         shortcutEntrance: 'grainmerchantreview',
-        //         module: 'audit.grainMerchant.grainMerchantInfo',
-        //         permissicon: [],
-        //         keepAlive: true,
-        //         _title: '粮商审核'
-        //     },
-        // },
+        {
+            path: 'grainmerchantreview',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainmerchantreview'),
+            name: 'grainmerchantreview',
+            meta: {
+                title: 'grainmerchantreview',
+                shortcutEntrance: 'grainmerchantreview',
+                module: 'audit.grainMerchant.grainMerchantInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '粮商审核'
+            },
+        },
 
-        // //司机审核
-        // {
-        //     path: 'driverreview',
-        //     component: () =>
-        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/driverreview'),
-        //     name: 'driverreview',
-        //     meta: {
-        //         title: 'driverreview',
-        //         shortcutEntrance: 'driverreview',
-        //         module: 'audit.driverMerchant.driverMerchantInfo',
-        //         permissicon: [],
-        //         keepAlive: true,
-        //         _title: '司机审核'
-        //     },
-        // },
+        //司机审核
+        {
+            path: 'driverreview',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/driverreview'),
+            name: 'driverreview',
+            meta: {
+                title: 'driverreview',
+                shortcutEntrance: 'driverreview',
+                module: 'audit.driverMerchant.driverMerchantInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '司机审核'
+            },
+        },
 
-        // //采购交易信息审核
-        // {
-        //     path: 'transactioninformationreview',
-        //     component: () =>
-        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/transactioninformationreview'),
-        //     name: 'transactioninformationreview',
-        //     meta: {
-        //         title: 'transactioninformationreview',
-        //         shortcutEntrance: 'transactioninformationreview',
-        //         module: 'audit.tranMerchant.tranMerchantInfo',
-        //         permissicon: [],
-        //         keepAlive: true,
-        //         _title: '采购信息审核'
-        //     },
-        // },
+        //采购交易信息审核
+        {
+            path: 'transactioninformationreview',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/transactioninformationreview'),
+            name: 'transactioninformationreview',
+            meta: {
+                title: 'transactioninformationreview',
+                shortcutEntrance: 'transactioninformationreview',
+                module: 'audit.tranMerchant.tranMerchantInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '采购信息审核'
+            },
+        },
 
-        // //销售交易信息审核
-        // {
-        //     path: 'saletransactioninformationreview',
-        //     component: () =>
-        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/saletransactioninformationreview'),
-        //     name: 'saletransactioninformationreview',
-        //     meta: {
-        //         title: 'saletransactioninformationreview',
-        //         shortcutEntrance: 'saletransactioninformationreview',
-        //         module: 'audit.tranMerchant.tranMerchantInfo',
-        //         permissicon: [],
-        //         keepAlive: true,
-        //         _title: '销售信息审核'
-        //     },
-        // },
-        // //粮脉企业审核
-        // {
-        //     path: 'grainpulseenterprisereview',
-        //     component: () =>
-        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainpulseenterprisereview'),
-        //     name: 'grainpulseenterprisereview',
-        //     meta: {
-        //         title: 'grainpulseenterprisereview',
-        //         shortcutEntrance: 'grainpulseenterprisereview',
-        //         module: 'audit.tranMerchant.tranMerchantInfo',
-        //         permissicon: [],
-        //         keepAlive: true,
-        //         _title: '粮脉企业审核'
-        //     },
-        // },
-        // //粮脉动态审核
-        // {
-        //     path: 'grainPulseDynamic',
-        //     component: () =>
-        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainPulseDynamic'),
-        //     name: 'grainPulseDynamic',
-        //     meta: {
-        //         title: 'grainPulseDynamic',
-        //         shortcutEntrance: 'grainPulseDynamic',
-        //         module: 'audit.grainMerchant.grainMerchantInfo.review',
-        //         permissicon: [],
-        //         keepAlive: true,
-        //         _title: '粮脉动态审核'
-        //     },
-        // },
-        // //交易信息审核
-        // {
-        //     path: 'tradeInformation',
-        //     component: () =>
-        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/tradeInformation'),
-        //     name: 'tradeInformation',
-        //     meta: {
-        //         title: 'tradeInformation',
-        //         shortcutEntrance: 'tradeInformation',
-        //         module: 'audit.grainMerchant.grainMerchantInfo.review',
-        //         permissicon: [],
-        //         keepAlive: true,
-        //         _title: '交易信息审核'
-        //     },
-        // },
-        // // 客服留言
-        // {
-        //     path: 'customerService',
-        //     component: () =>
-        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/customerService'),
-        //     name: 'customerService',
-        //     meta: {
-        //         title: 'customerService',
-        //         shortcutEntrance: 'customerService',
-        //         module: 'audit.grainMerchant.grainMerchantInfo',
-        //         permissicon: [],
-        //         keepAlive: true,
-        //         _title: '客服留言'
-        //     },
-        // },
-//     ],
-// };
-// export default platformauditRouter;
+        //销售交易信息审核
+        {
+            path: 'saletransactioninformationreview',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/saletransactioninformationreview'),
+            name: 'saletransactioninformationreview',
+            meta: {
+                title: 'saletransactioninformationreview',
+                shortcutEntrance: 'saletransactioninformationreview',
+                module: 'audit.tranMerchant.tranMerchantInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '销售信息审核'
+            },
+        },
+        //粮脉企业审核
+        {
+            path: 'grainpulseenterprisereview',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainpulseenterprisereview'),
+            name: 'grainpulseenterprisereview',
+            meta: {
+                title: 'grainpulseenterprisereview',
+                shortcutEntrance: 'grainpulseenterprisereview',
+                module: 'audit.tranMerchant.tranMerchantInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '粮脉企业审核'
+            },
+        },
+        //粮脉动态审核
+        {
+            path: 'grainPulseDynamic',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainPulseDynamic'),
+            name: 'grainPulseDynamic',
+            meta: {
+                title: 'grainPulseDynamic',
+                shortcutEntrance: 'grainPulseDynamic',
+                module: 'audit.grainMerchant.grainMerchantInfo.review',
+                permissicon: [],
+                keepAlive: true,
+                _title: '粮脉动态审核'
+            },
+        },
+        //交易信息审核
+        {
+            path: 'tradeInformation',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/tradeInformation'),
+            name: 'tradeInformation',
+            meta: {
+                title: 'tradeInformation',
+                shortcutEntrance: 'tradeInformation',
+                module: 'audit.grainMerchant.grainMerchantInfo.review',
+                permissicon: [],
+                keepAlive: true,
+                _title: '交易信息审核'
+            },
+        },
+        // 客服留言
+        {
+            path: 'customerService',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/customerService'),
+            name: 'customerService',
+            meta: {
+                title: 'customerService',
+                shortcutEntrance: 'customerService',
+                module: 'audit.grainMerchant.grainMerchantInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '客服留言'
+            },
+        },
+    ],
+};
+export default platformauditRouter;

src/views/statisticalReport/autoSettlementList.vue

@@ -140,12 +140,16 @@
               src="../../../public/img/edit.png" @click="editactualLoss(scope.row)" alt="" /></div>
           </template>
         </el-table-column>
-        <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
-        <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
+        <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价">
+          <template slot-scope="scope">
+            <span >{{ scope.row.transportPrice }} <span>{{scope.row.billingMethod==2?'元/车':'元/吨'}}</span> </span>
+          </template>
+        </el-table-column>
+        <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价">
           <template slot-scope="scope">
             <span v-if="
               !scope.row.settlementPricechange && scope.row.settlementPrice
-            ">{{ scope.row.settlementPrice }}</span>
+            ">{{ scope.row.settlementPrice }}<span>{{scope.row.billingMethod==2?'元/车':'元/吨'}}</span> </span>
             <input v-if="scope.row.settlementPricechange" style="width: 60px" v-model="settlementPrice" type="text" />
             <div style="display:inline-block;" v-hasPermission="`report.transportationReport.wuliu`">
             <i @click="changesettlementPrice(scope.row)" v-if="

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -73,43 +73,43 @@
       <el-table class="wenzi" :data="saleList.records" :row-class-name="tableRowClassName"
         style="width: 100%; padding-top: 20px" ref="saleList" border :summary-method="getSummaries" show-summary
         @selection-change="handleSelectionChange" @row-click="handleRowClick" v-if="orderList.deliverType==1">
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column v-if="this.tranType!='退库'" class="table_td" prop="processNo" label="运输任务阶段编号">
+        <el-table-column key="1" type="selection" width="55"></el-table-column>
+        <el-table-column key="2" type="index" label="序号" width="50"></el-table-column>
+        <el-table-column key="3" v-if="this.tranType!='退库'" class="table_td" prop="processNo" label="运输任务阶段编号">
         </el-table-column>
-        <el-table-column class="table_td" prop="warehouseName" label="仓库" v-if="this.tranType=='退库'"></el-table-column>
-        <el-table-column class="table_td" prop="carNo" label="车牌号" v-if="this.tranType=='汽运'||this.tranType=='退库'">
+        <el-table-column key="4" class="table_td" prop="warehouseName" label="仓库" v-if="this.tranType=='退库'"></el-table-column>
+        <el-table-column key="5" class="table_td" prop="carNo" label="车牌号" v-if="this.tranType=='汽运'||this.tranType=='退库'">
           <template slot-scope="scope">
             <span>{{scope.row.carNo }}({{scope.row.tranCarNo}})</span>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" prop="binNumber" label="仓位号" v-if="this.tranType=='散船'"></el-table-column>
-        <el-table-column class="table_td" prop="boxNo" label="车厢号" v-if="this.tranType=='火运'"></el-table-column>
-        <el-table-column class="table_td" prop="caseNo" label="箱号"
+        <el-table-column key="6" class="table_td" prop="binNumber" label="仓位号" v-if="this.tranType=='散船'"></el-table-column>
+        <el-table-column key="7" class="table_td" prop="boxNo" label="车厢号" v-if="this.tranType=='火运'"></el-table-column>
+        <el-table-column key="8" class="table_td" prop="caseNo" label="箱号"
           v-if="this.tranType=='汽运'||this.tranType=='箱船'||this.tranType=='退库'"></el-table-column>
-        <el-table-column class="table_td" prop="titleNo" label="封号"
+        <el-table-column key="9" class="table_td" prop="titleNo" label="封号"
           v-if="this.tranType=='汽运'||this.tranType=='箱船'||this.tranType=='退库'"></el-table-column>
-        <el-table-column class="table_td" prop="createDate" label="卸车反馈日期"
+        <el-table-column key="10" class="table_td" prop="createDate" label="卸车反馈日期"
           v-if="this.tranType=='汽运'||this.tranType=='火运'"></el-table-column>
-        <el-table-column class="table_td" prop="createDate" label="卸船反馈日期"
+        <el-table-column key="11" class="table_td" prop="createDate" label="卸船反馈日期"
           v-if="this.tranType=='散船'||this.tranType=='箱船'"></el-table-column>
-        <el-table-column class="table_td" prop="returnDate" label="退库日期" v-if="this.tranType=='退库'"></el-table-column>
-        <el-table-column class="table_td" prop="feedbackPerson" label="卸车反馈人"
+        <el-table-column key="12" class="table_td" prop="returnDate" label="退库日期" v-if="this.tranType=='退库'"></el-table-column>
+        <el-table-column key="13" class="table_td" prop="feedbackPerson" label="卸车反馈人"
           v-if="this.tranType=='汽运'||this.tranType=='火运'"></el-table-column>
-        <el-table-column class="table_td" prop="feedbackPerson" label="卸船反馈人"
+        <el-table-column key="14" class="table_td" prop="feedbackPerson" label="卸船反馈人"
           v-if="this.tranType=='散船'||this.tranType=='箱船'"></el-table-column>
-        <el-table-column class="table_td" prop="grossWeight" label="毛重（吨）" v-if="this.tranType=='退库'"></el-table-column>
-        <el-table-column class="table_td" prop="tare" label="皮重（吨）" v-if="this.tranType=='退库'"></el-table-column>
-        <el-table-column class="table_td" prop="netWeight" label="净重（吨）" v-if="tranType=='退库'">
+        <el-table-column key="15" class="table_td" prop="grossWeight" label="毛重（吨）" v-if="this.tranType=='退库'"></el-table-column>
+        <el-table-column key="16" class="table_td" prop="tare" label="皮重（吨）" v-if="this.tranType=='退库'"></el-table-column>
+        <el-table-column key="17" class="table_td" prop="netWeight" label="净重（吨）" v-if="tranType=='退库'">
           <template slot-scope="scope">
             <span>-{{scope.row.netWeight }}</span>
           </template>
         </el-table-column>
-        <el-table-column width='120' class="table_td" prop="unloadingWeight" label="卸车净重（吨）"
+        <el-table-column key="18" width='120' class="table_td" prop="unloadingWeight" label="卸车净重（吨）"
           v-if="this.tranType=='汽运'||this.tranType=='火运'"></el-table-column>
-        <el-table-column v-else-if="this.tranType=='散船'||this.tranType=='箱船'" class="table_td" prop="unloadingWeight"
+        <el-table-column key="19" v-else-if="this.tranType=='散船'||this.tranType=='箱船'" class="table_td" prop="unloadingWeight"
           label="卸船净重（吨）"></el-table-column>
-        <el-table-column width='120' class="table_td" prop="feedbackWeight" label="反馈重量（吨）">
+        <!-- <el-table-column key="20" width='120' class="table_td" prop="feedbackWeight" label="反馈重量（吨）">
           <template slot-scope="scope">
             <div class="inputChenge">
               <el-input v-model="scope.row.feedbackWeight" v-if="scope.row.identification2 == 'true'">
@@ -127,9 +127,9 @@
             <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
               v-if="scope.row.identification2 == 'true'" @click="weightsave(scope.row,4)"></i>
           </template>
-        </el-table-column>
-        <el-table-column width='120' class="table_td" prop="settlementWeight" label="结算重量（吨）"></el-table-column>
-        <el-table-column class="table_td" prop="settlementPrice" width='130' label="结算单价（元/吨）">
+        </el-table-column> -->
+        <el-table-column key="21" width='120' class="table_td" prop="settlementWeight" label="结算重量（吨）"></el-table-column>
+        <el-table-column key="22" class="table_td" prop="settlementPrice" width='130' label="结算单价（元/吨）">
           <template slot-scope="scope">
             <div class="inputChenge">
               <el-input v-model="scope.row.settlementPrice" v-if="scope.row.identification1 == 'true'">
@@ -148,7 +148,7 @@
               v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
           </template>
         </el-table-column>
-        <el-table-column  width='130' class="table_td"  prop="amountIngReceivable" label="应收金额（元）">
+        <el-table-column  key="23" width='130' class="table_td"  prop="amountIngReceivable" label="应收金额（元）">
           <template slot-scope="scope">
             <div class="inputChenge">
               <el-input v-model="scope.row.amountIngReceivable" v-if="scope.row.identification3 == 'true'">
@@ -167,11 +167,11 @@
               v-if="scope.row.identification3 == 'true'" @click="weightClick(scope.row,5)"></i>
           </template>
         </el-table-column>
-        <el-table-column width='120' class="table_td" prop="amountEdReceivable" label="已收金额（元）">
+        <el-table-column key="24" width='120' class="table_td" prop="amountEdReceivable" label="已收金额（元）">
         </el-table-column>
-        <el-table-column width='120' class="table_td" prop="amountNotReceivable" label="未收金额（元）">
+        <el-table-column key="25" width='120' class="table_td" prop="amountNotReceivable" label="未收金额（元）">
         </el-table-column>
-        <el-table-column width='120' class="table_td" prop="alreadyInvoice" label=" 已开发票（元）">
+        <el-table-column key="26" width='120' class="table_td" prop="alreadyInvoice" label=" 已开发票（元）">
           <template slot-scope="scope">
             <div class="inputChenge">
               <div class="inputs">
@@ -184,7 +184,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" prop="collectionDate" label="收款日期">
+        <el-table-column key="27" class="table_td" prop="collectionDate" label="收款日期">
         </el-table-column>
         <!-- <el-table-column class="table_td" prop="status" label="状态">
         </el-table-column> -->

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -129,10 +129,10 @@
 						<el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
 						</el-select>
 					</el-form-item>
-					<!-- <el-form-item label="任务标识">
+					<el-form-item label="任务标识">
 						<el-input  @input="taskFlaginput" v-model="dataList.taskFlag"
 							placeholder="请输入任务标识" maxlength="6" size="small" class="huom" />
-					</el-form-item> -->
+					</el-form-item>
 					<!--业务描述=-->
 					<el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="20">
 						<el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"
@@ -257,10 +257,10 @@
 						<el-option v-for="item in options1" :key="item.value" :label="item.staffName" :value="item.staffName" />
 						</el-select>
 					</el-form-item>
-					<!-- <el-form-item label="任务标识">
+					<el-form-item label="任务标识">
 						<el-input :disabled="dataList.taskTypeKey == 3" @input="taskFlaginput" v-model="dataList.taskFlag"
 							placeholder="请输入任务标识" maxlength="6" size="small" class="huom" />
-					</el-form-item> -->
+					</el-form-item>
 					<!--业务描述=-->
 					<el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
 						<el-input v-model="dataList1.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"
@@ -367,10 +367,10 @@
 						<el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
 						</el-select>
 					</el-form-item>
-					<!-- <el-form-item label="任务标识">
+					<el-form-item label="任务标识">
 						<el-input :disabled="dataList.taskTypeKey == 4" v-model="dataList.taskFlag"
 							placeholder="请输入任务标识" maxlength="6" size="small" class="huom" />
-					</el-form-item> -->
+					</el-form-item>
 					<!--业务描述=-->
 					<el-form-item label="业务描述">
 						<el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"

src/views/warehousenew/goodsrollIn.vue

@@ -27,7 +27,7 @@
                 <el-input disabled placeholder="自动获取，不可编辑" v-model="form.customer"></el-input>
             </el-form-item>
             <el-form-item label="货名">
-                <el-select filterable clearable @change="goosnamechange" v-model="form.goodsName" placeholder="选择货名">
+                <el-select disabled filterable clearable @change="goosnamechange" v-model="form.goodsName" placeholder="选择货名">
                     <el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue" :value="item.constValue"></el-option>
                 </el-select>
             </el-form-item>
@@ -121,6 +121,7 @@ import {xialaNo} from '@/model/tasksport/index'
       return {
         cusationinfo:[],
         tableData:[],
+        contractNoListGoodName:'',
         contractNoList:[],
         goodnameList:[],
         warehouseList:[],
@@ -225,6 +226,9 @@ import {xialaNo} from '@/model/tasksport/index'
                 this.$message.error('入库重量与出库重量不相等！')
                 return
             }
+            if(this.form.goodsName!=this.contractNoListGoodName){
+                this.$message.error('采购合同货名与关联转出业务货名不一致！')
+              }
             this.$confirm('确定提交货权转移信息？', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
@@ -294,8 +298,13 @@ import {xialaNo} from '@/model/tasksport/index'
                     this.$set(this.form,'bankBranch',this.customerList[q].bankDepositBranch)
                   }
                 }
+            }else{
+              if(this.form.goodsName!=this.contractNoList[i].goodsName){
+                this.$message.error('采购合同货名与关联转出业务货名不一致！')
+              }
             }
             if(this.contractNoList[i].contractNo==e){
+              this.contractNoListGoodName=this.contractNoList[i].goodsName
               this.$set(this.form,'contractSeller',this.contractNoList[i].seller)
                 this.$set(this.form,'goodsName',this.contractNoList[i].goodsName)
                 this.$set(this.form,'goodsNameKey',this.contractNoList[i].goodsNameKey)

src/views/warehousenew/warehouseManagementRecord.vue

@@ -187,8 +187,8 @@
               <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="salesTransferStatus" label="销售转移状态"  width="150px">
+          </el-table-column> -->
           
           <el-table-column prop="addressUrl" label="操作" width="100px">
             <template slot-scope="scope">
@@ -243,6 +243,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="goodsName" label="货名"> </el-table-column>
           <el-table-column prop="grossWeight" label="毛重（吨）"></el-table-column>
           <el-table-column prop="tare" label="皮重（吨）"> </el-table-column>
@@ -269,11 +279,11 @@
             </template>
           </el-table-column>
           <el-table-column prop="inOutType" label="类型"> </el-table-column>
-          <el-table-column prop="contractNo" label="合同编号">
+          <!-- <el-table-column prop="contractNo" label="合同编号">
             <template slot-scope="scope">
               <span style="color: #8890b1">{{ scope.row.contractNo }}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column prop="carNo" label="车牌号">
             <template slot-scope="scope">
               <span style="color: #8890b1">{{ scope.row.carNo }}</span>
@@ -282,6 +292,8 @@
           <el-table-column prop="agent" label="经办人">
           </el-table-column>
           <el-table-column prop="backOffice" label="操作人"> </el-table-column>
+          <!-- <el-table-column prop="salesTransferStatus" label="销售转移状态"  width="150px">
+          </el-table-column> -->
           <el-table-column prop="addressUrl" label="附件">
             <template slot-scope="scope">
               <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
@@ -322,13 +334,14 @@
       <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-option v-for="item in arr2"  :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-input disabled v-model="currectdata.contractNopointOut" placeholder="选择转移后的销售合同编号或移库编号"></el-input>
         </el-form-item>
         <el-form-item label="运输任务（自运必填）">
           <!-- <el-input disabled v-model="currectdata.tranTaskNew" placeholder="选择转移后的运输任务编号"></el-input> -->
@@ -437,6 +450,7 @@
         selectpackingMethod: {},
         size: 10,
         warehouseType: '1',
+        taskNolist1:[],
         compId: localStorage.getItem('ws-pf_compId'),
         deptCircularPage: {},
         pcFlag: 1,
@@ -446,6 +460,8 @@
         },
         warehouseList: [],
         taskNolist:[],
+        taskNolist1:[],
+        arr2:[],
         deptBudgetList: {},
         historyList: [],
         searchType: '',
@@ -510,8 +526,11 @@
             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
+        this.currectdata.contractNopointOut=this.currectdata.contractNoNew+'（'+this.currectdata.pointOutNew+'）'
+        
         var data=await getYunShuNumber({contractNo:this.currectdata.contractNoNew}).toPromise()
         this.currectdata.tranTaskNew=data[0].taskNo
         this.taskInfo=data
@@ -557,6 +576,14 @@
           this.currectdata.taskNo=arr.toString()
           this.currectdata.contractNo=this.modification[0].contractNo
           this.currectdata.pointOut=contractNo.pointOut
+          this.taskNolist=this.taskNolist1
+          this.arr2=[]
+          for (let i = 0; i < this.taskNolist.length; i++) {
+            if(this.taskNolist[i].contractNo&&this.taskNolist[i].contractNo!=this.currectdata.contractNo||this.taskNolist[i].moveTaskNo&&this.taskNolist[i].moveTaskNo!=this.currectdata.contractNo){
+              this.arr2.push(this.taskNolist[i])
+            }
+          }
+          console.log(this.arr2)
           this.show=true
         }
       },
@@ -800,6 +827,7 @@
           })
           .toPromise()
           .then((response) => {
+            this.taskNolist1 = response
             this.taskNolist = response
           })
 

src/views/warehousenew/warehousingOrder.vue

@@ -878,10 +878,17 @@ export default {
           this.$refs[`multipleTable${i}`][0].toggleAllSelection();
         }
         this.tabletotal=this.tabletotal.toFixed(3)
-      
-      
       // 
     },
+    clearchecked(){
+      if(this.checked){
+        this.checked=false
+        for (let i = 0; i < this.gainList.length; i++) {
+          this.$refs[`multipleTable${i}`][0].clearSelection();
+        }
+      }
+      
+    },
     weightinput(e){
       this.rollweight=0
       for (let i = 0; i < this.rolloutData.cargoPositionDetailsList.length; i++) {
@@ -2488,6 +2495,7 @@ export default {
           // this.pageSize = response.size
           console.log(this.gainList, 96)
           this.deptBudgetTotal = response.total
+          this.clearchecked()
         })
     },