فهرست منبع

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

# Conflicts:
#	src/api/V2/houseSelfCollect/index.js
#	src/model/houseSelfCollect/index.js
zhongtianhaoyuan 3 سال پیش
والد
کامیت
8bb530131c
25فایلهای تغییر یافته به همراه1822 افزوده شده و 1791 حذف شده
  1. 6 6
      public/static/payprint.html
  2. 1 3
      public/static/weightCheckInOut.html
  3. 3 3
      public/static/weightCheckOut.html
  4. 8 0
      src/api/V2/houseSelfCollect/index.js
  5. 2 0
      src/api/V2/warehouse/index.js
  6. 8 2
      src/model/houseSelfCollect/index.js
  7. 3 0
      src/model/warehouse/index.js
  8. 108 39
      src/views/contractManagement/purchaseContract.vue
  9. 107 38
      src/views/contractManagement/salesContract.vue
  10. 148 142
      src/views/houseSelfCollect/inspectInfo.vue
  11. 104 49
      src/views/houseSelfCollect/paymentManagement.vue
  12. 32 0
      src/views/houseSelfCollect/weighingManagement.vue
  13. 2 2
      src/views/houseSelfCollect/weightCheck.vue
  14. 13 9
      src/views/statisticalReport/autoSettlementList.vue
  15. 12 8
      src/views/statisticalReport/huoyunList.vue
  16. 22 13
      src/views/statisticalReport/purchaseClosingCashierList.vue
  17. 16 9
      src/views/statisticalReport/purchaseReceiptStatisticsList.vue
  18. 11 8
      src/views/statisticalReport/salesClosingCashierList.vue
  19. 12 8
      src/views/statisticalReport/salesDeliveryReportList.vue
  20. 11 9
      src/views/statisticalReport/shippingList.vue
  21. 19 17
      src/views/statisticalReport/stockPurchaseReceiptReportList.vue
  22. 1058 1403
      src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue
  23. 76 2
      src/views/warehouse/warehouseManagementNoWeight.vue
  24. 24 2
      src/views/warehouse/warehouseManagementRecord.vue
  25. 16 19
      src/views/warehouse/warehouseManagementTare.vue

+ 6 - 6
public/static/payprint.html

@@ -536,13 +536,13 @@
                 </div>
                 <img :src="customerList1[index].imgURl.imageUrl1" class="avatar" />
               </div>
-              <div class="sfcard-content">
+         <!--     <div class="sfcard-content">
                 <div class="sfcard-title">
                   {{
                   printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
                 </div>
                 <img :src="customerList1[index].imgURl.imageUrl2" class="avatar" />
-              </div>
+              </div> -->
             </div>
             <div class="bankcard" v-if="isShowPrintType2">
 
@@ -552,12 +552,12 @@
                 </div>
                 <img :src="customerList1[index].imgURl.imageUrl3" class="avatar" />
               </div>
-              <div class="sfcard-content part2">
+    <!--          <div class="sfcard-content part2">
                 <div class="sfcard-title">
                   {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
                 </div>
                 <img :src="customerList1[index].imgURl.imageUrl4" class="avatar" />
-              </div>
+              </div> -->
             </div>
           </div>
         </div>
@@ -1209,10 +1209,10 @@
           let _lsit = this.showType.split(',')
           for (let i = 0; i < _lsit.length; i++) {
             switch (_lsit[i]) {
-              case '打印身份证(正反面)':
+              case '打印身份证':
                 this.isShowPrintType1 = !this.isShowPrintType1
                 break
-              case '打印银行卡(正反面)':
+              case '打印银行卡':
                 this.isShowPrintType2 = !this.isShowPrintType2
                 break
               case '打印结算凭证':

+ 1 - 3
public/static/weightCheckInOut.html

@@ -157,7 +157,7 @@
             <td class="col col-bgc">皮重(吨)</td>
             <td class="col">{{tableData.tare}}</td>
             <td class="col col-bgc">扣重(吨)</td>
-            <td class="col">{{tableData.deductionWeight}}</td>
+            <td class="col">{{tableData.deductionWeight ? tableData.deductionWeight : '0'}}</td>
             <td class="col col-bgc" colspan="2">净重(吨)</td>
             <td class="col">{{tableData.netWeight}}</td>
           </tr>
@@ -225,9 +225,7 @@
           this.smallContent = true
           this.bigContent = false
         }
-        console.log(_data, "sddsd")
         this.tableData = _data
-        console.log(this.tableData)
         document.title = "粮食检斤单"
         window.print()
         window.onafterprint = function(event) {

+ 3 - 3
public/static/weightCheckOut.html

@@ -162,11 +162,11 @@
             <td class="col col-bgc" v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"'>箱号</td>
             <td class="col col-bgc" v-if='tableData.outType=="火运"'>车厢号</td>
             <td class="col col-bgc" v-if='tableData.outType=="散船"'>船次</td>
-            <td class="col" colspan="2" v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"'>
-              {{tableData.boxNo}},{{tableData.boxNoOther}}
+            <td class="col" colspan="2" v-if='(tableData.outType=="集装箱船"||tableData.outType=="汽运"'>
+              {{tableData.boxNo}} {{tableData.boxNoOther}}
             </td>
             <td class="col" colspan="2" v-if='tableData.outType=="火运"'>
-              {{tableData.wingNumber}},{{tableData.wingNumberOther}}
+              {{tableData.wingNumber}} {{tableData.wingNumberOther}}
             </td>
             <td class="col" colspan="2" v-if='tableData.outType=="散船"'>{{tableData.shipNumber}}</td>
           </tr>

+ 8 - 0
src/api/V2/houseSelfCollect/index.js

@@ -56,6 +56,8 @@ export const API_GET_WEIGHTCHECK_GETWEIGHINGLIST = '/weighingManagement/selectWe
 export const API_POST_WEIGHTCHECK_TARE= '/weighingManagement/api/editTare'
 //毛重检斤保存
 export const API_POST_WEIGHTCHECK_GROSSWEIGHT = '/weighingManagement/api/editGrossWeight'
+//检斤管理删除
+export const API_POST_INSPECT_GETWEIGHTDELETE = '/weighingManagement/api/deleteWeightcheck'
 //付款查看
 export const API_GET_PAYMENT = '/paymentManagement/getInfo'
 // 付款结算
@@ -99,5 +101,11 @@ export const API_GAT_GETQRCODE = '/weighingManagement/getQRcode'
 export const API_GAT_INFO = '/commonSysParameter/getInfo'
 // 审核之后接口
 export const API_POST_WORKFLOW_TASK = `/newWorkflow/getTaskWebsocket`
+<<<<<<< HEAD
 // 结算单
 export const API_GET_SETTLEACCOUT = '/warehouseInOutInfo/getInfo'
+=======
+// 反结算
+// export const API_POST_SUSPENDINSTANCE ='/api/suspendInstance'
+export const API_POST_SUSPENDINSTANCE ='/paymentManagement/api/ReSettlement'
+>>>>>>> a576e7fc5265f44a1e3b51f234224749074e2d4b

+ 2 - 0
src/api/V2/warehouse/index.js

@@ -96,6 +96,8 @@ export const API_GET_TURNAROUND_LIST = '/turnInfo/selectTurnInfo'
 export const API_GET_TURNAROUND_XIALA = '/turnInfo/getPositionAndGoodsName'
 //折转后货名
 export const API_get_goodsName_All = '/commonSysParameter/getInfo'
+//退回
+export const API_SEND_BACK ='/warehouseInOutInfo/returnWarehouse'
 
 
 

+ 8 - 2
src/model/houseSelfCollect/index.js

@@ -52,7 +52,9 @@ import {
   API_GAT_INFO,
   API_POST_WORKFLOW_TASK,
   API_GET_INSPECT_CONTRACTNO,
-  API_GET_SETTLEACCOUT
+  API_GET_SETTLEACCOUT,
+  API_POST_INSPECT_GETWEIGHTDELETE,
+  API_POST_SUSPENDINSTANCE
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -112,6 +114,8 @@ export const getweighingList = appRx.get(API_GET_WEIGHTCHECK_GETWEIGHINGLIST, er
 export const tare = appRx.post(API_POST_WEIGHTCHECK_TARE, errorCatcher, errorHandle, filter)
 //毛重检斤保存
 export const grossWeight = appRx.post(API_POST_WEIGHTCHECK_GROSSWEIGHT, errorCatcher, errorHandle, filter)
+//检斤删除
+export const getweighingDelete = appRx.post(API_POST_INSPECT_GETWEIGHTDELETE, errorCatcher, errorHandle, filter)
 //付款信息查看
 export const getpaymentexamine = appRx.get(API_GET_PAYMENT, errorCatcher, errorHandle, filter)
 //付款信息结算
@@ -158,4 +162,6 @@ export const getcartype  = appRx.get(API_GAT_INFO, errorCatcher, errorHandle, fi
 export const workflowcontent = appRx.get(API_POST_WORKFLOW_TASK, errorCatcher, errorHandle, filter)
 
 // 查看结算单
-export const getsettleaccout = appRx.get(API_GET_SETTLEACCOUT, errorCatcher, errorHandle, filter)
+export const getsettleaccout = appRx.get(API_GET_SETTLEACCOUT, errorCatcher, errorHandle, filter)
+// 反结算
+export const suspendinstance = appRx.post(API_POST_SUSPENDINSTANCE, errorCatcher, errorHandle, filter)

+ 3 - 0
src/model/warehouse/index.js

@@ -47,6 +47,7 @@ import {
     API_POST_TURNAROUND_ADD,
     API_GET_TURNAROUND_XIALA,
     API_get_goodsName_All,
+    API_SEND_BACK
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
 // 列表
@@ -142,5 +143,7 @@ export const turnAroundList = appRx.get(API_GET_TURNAROUND_LIST,errorCatcher, er
 export const turnAroundXiaLa = appRx.get(API_GET_TURNAROUND_XIALA,errorCatcher, errorHandle, filter)
 //折转后所有货名
 export const turnAroundGoodsNameAll = appRx.get(API_get_goodsName_All,errorCatcher, errorHandle, filter)
+//退回
+export const sendback = appRx.post(API_SEND_BACK,errorCatcher, errorHandle, filter)
 
 

+ 108 - 39
src/views/contractManagement/purchaseContract.vue

@@ -59,62 +59,89 @@
         </template>
       </el-table-column> -->
       <el-table-column prop="weight" label="重量(吨)"> </el-table-column>
-      <el-table-column prop="unitContractPrice" label="合同单价(元)">
+      <el-table-column width='130' prop="unitContractPrice" label="合同单价(元)">
       </el-table-column>
       <!-- <el-table-column prop="packingMethod" label="包装方式"> </el-table-column> -->
       <el-table-column prop="buyer" label="买方"> </el-table-column>
       <el-table-column prop="seller" label="卖方"> </el-table-column>
-      <el-table-column prop="completedQuantity" label="已完成(吨)">
+      <el-table-column width='120' prop="completedQuantity" label="已完成(吨)">
         <template slot-scope="scope">
           <span style="color: #5473e8; font-weight: 600">{{
             scope.row.completedQuantity
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="status" label="状态">
+      <el-table-column width='150' prop="status" label="状态">
         <template slot-scope="scope">
-          <span v-if="scope.row.approveStatus">{{
-            scope.row.approveStatus
-          }}</span>
-          <el-popover v-else placement="left" :width="285" trigger="click" visible-arrow="false"
-            @show="history(scope.row)">
-            <template>
-              <span slot="reference">
-                <span v-if="scope.row.status == '待执行'" class="executory"></span>
-                <span v-if="scope.row.status == '执行中'" class="inExecution"></span>
-                <span v-if="scope.row.status == '已完成'" class="done"></span>{{ scope.row.status }}
-              </span>
-            </template>
-            <div>
-              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
-              <div v-for="(item, index) in historyList" :key="index" class="flex">
-                <div class="vertical-text vertical-text-left">
-                  {{ item.updateDate }}
-                </div>
-                <div>
-                  <div class="vertical-circle"></div>
-                  <div v-if="index != historyList.length - 1" class="vertical-line"></div>
-                </div>
-                <div class="vertical-text">
-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
+          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'">
+            <!-- <span v-if="scope.row.approveStatus">{{
+              scope.row.approveStatus
+            }}</span> -->
+            <el-select v-if="scope.row.approveStatus" v-model="scope.row.approveStatus" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+            disabled
+            :value="scope.row.approveStatus">
+            <el-option label="待决策人审核" value="待决策人审核"
+              style="color: #8890b1" />
+          </el-select>
+          <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+
+            :value="scope.row.status">
+            <el-option label="待执行" value="待执行"
+              style="color: #8890b1" />
+              <el-option label="执行中" value="执行中"
+              style="color: #8890b1" />
+          </el-select>
+            <!-- <el-popover v-else placement="left" :width="285" trigger="click" visible-arrow="false"
+              @show="history(scope.row)">
+              <template>
+                <span slot="reference">
+                  <span v-if="scope.row.status == '待执行'" class="executory"></span>
+                  <span v-if="scope.row.status == '执行中'" class="inExecution"></span>
+                  <span v-if="scope.row.status == '已完成'" class="done"></span>{{ scope.row.status }}
+                </span>
+              </template>
+              <div>
+                <p style="margin-top: 0; padding-left: 10px">操作历史</p>
+                <div v-for="(item, index) in historyList" class="flex">
+                  <div class="vertical-text vertical-text-left">
+                    {{ item.updateDate }}
+                  </div>
+                  <div>
+                    <div class="vertical-circle"></div>
+                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
+                  </div>
+                  <div class="vertical-text">
+                    {{ item.operateUser }}<br />{{ item.dealMsg }}
+                  </div>
                 </div>
               </div>
-            </div>
-          </el-popover>
-          <img v-if="!scope.row.approveStatus" width="17" height="18"
-            style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
-            @click="editClick(scope.row)" alt="" />
-          <!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
+            </el-popover>
+            <img v-if="!scope.row.approveStatus" width="17" height="18"
+              style="vertical-align: text-top; position: relative; top: -1px;" src="../../../public/img/edit.png"
+              @click="editClick(scope.row)" alt="" /> -->
+          </div>
+          <div v-else>
+            <!-- {{scope.row.status}} -->
+            <el-select v-model="scope.row.status" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+            :value="scope.row.status"
+          >
+            <el-option v-for="item in statusList" :key="item.value" :label="item.value" :value="item.value"
+              style="color: #8890b1" />
+          </el-select>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column prop="contractExpenditure" label="合同支出"> </el-table-column>
-      <el-table-column prop="expenses" label="费用支出"> </el-table-column>
+      <el-table-column width='120' prop="signingDate" label="签订日期"> </el-table-column>
+      <el-table-column width='120' prop="contractExpenditure" label="合同支出"> </el-table-column>
+      <el-table-column width='120' prop="expenses" label="费用支出"> </el-table-column>
       
-      <el-table-column prop="mildewGrain" label="已付款(元)">
+      <el-table-column width='130' prop="mildewGrain" label="已付款(元)">
       </el-table-column>
       <el-table-column prop="amountEdPayable" label="已付运费"> </el-table-column>
-      <el-table-column prop="goodsNames" label="已开发票 (元)">
+      <el-table-column width='130' prop="goodsNames" label="已开发票 (元)">
       </el-table-column>
       <el-table-column prop="addressUrl" label="附件">
         <template slot-scope="scope">
@@ -210,6 +237,9 @@
         // 表格显示数据
         tableDate: [],
         size: 10,
+        statusList:[{
+          value:'已完成',
+        },{value:'发运结束',}],
         // 是否显示
         showType: true,
         // 年
@@ -361,6 +391,37 @@
       handleClose() {
         this.dialogViewSpareMoney = false
       },
+      selectstatuschange(e,row){
+        var data={}
+        if(e=='发运结束'){
+          data={id: row.id,endFlag:1}
+        }else{
+          data={id: row.id}
+        }
+        this.$confirm(`是否将状态改为${e}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            editstatus(data)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '状态修改成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            row.status=row.currectstatus
+            return false
+          })
+      },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)
         this.pageSize = val
@@ -387,6 +448,9 @@
           .toPromise()
           .then((response) => {
             for (var i = 0; i < response.records.length; i++) {
+              if(response.records[i].status){
+                response.records[i].currectstatus=response.records[i].status
+              }
               if (response.records[i].completedQuantity) {
                 response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
               }
@@ -429,7 +493,7 @@
         var status = ''
         if (row.status == '待执行' || row.status == '已完成') {
           status = '执行中'
-        } else if (row.status == '执行中') {
+        } else if (row.status == '执行中'||row.status == '发运结束') {
           status = '已完成'
         }
         this.$confirm(`是否将状态改为${status}`, '提示', {
@@ -454,6 +518,7 @@
               })
           })
           .catch(() => {
+
             return false
           })
       },
@@ -929,4 +994,8 @@
   /deep/.typeselect .el-input__inner {
     color: #8890b1;
   }
+  /deep/.statusselect .el-input__inner {
+    color: #8890b1;
+    width:100%;
+  }
 </style>

+ 107 - 38
src/views/contractManagement/salesContract.vue

@@ -61,12 +61,11 @@
         </template>
       </el-table-column> -->
       <el-table-column prop="weight" label="重量(吨)"> </el-table-column>
-      <el-table-column prop="unitContractPrice" label="合同单价(元)">
-      </el-table-column>
+      <el-table-column width='150' prop="unitContractPrice" label="合同单价(元)"></el-table-column>
       <!-- <el-table-column prop="packingMethod" label="包装方式"> </el-table-column> -->
       <el-table-column prop="buyer" label="买方"> </el-table-column>
       <el-table-column prop="seller" label="卖方"> </el-table-column>
-      <el-table-column prop="completedQuantity" label="已完成(吨)">
+      <el-table-column width='150' prop="completedQuantity" label="已完成(吨)">
         <template slot-scope="scope">
           <span v-if="scope.row.proportion < 90"
             style="color: #5473e8; font-weight: 600">{{ scope.row.completedQuantity }}</span>
@@ -74,45 +73,73 @@
             style="color: red; font-weight: 600">{{ scope.row.completedQuantity }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="status" label="状态">
+      <el-table-column width='150' prop="status" label="状态">
         <template slot-scope="scope">
-          <span v-if="scope.row.approveStatus">{{
-            scope.row.approveStatus
-          }}</span>
-          <el-popover v-else placement="left" :width="285" trigger="click" visible-arrow="false"
-            @show="history(scope.row)">
-            <template>
-              <span slot="reference">
-                <span v-if="scope.row.status == '待执行'" class="executory"></span>
-                <span v-if="scope.row.status == '执行中'" class="inExecution"></span>
-                <span v-if="scope.row.status == '已完成'" class="done"></span>{{ scope.row.status }}
-              </span>
-            </template>
-            <div>
-              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
-              <div v-for="(item, index) in historyList" class="flex">
-                <div class="vertical-text vertical-text-left">
-                  {{ item.updateDate }}
-                </div>
-                <div>
-                  <div class="vertical-circle"></div>
-                  <div v-if="index != historyList.length - 1" class="vertical-line"></div>
-                </div>
-                <div class="vertical-text">
-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
+          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'">
+            <!-- <span v-if="scope.row.approveStatus">{{
+              scope.row.approveStatus
+            }}</span> -->
+            <el-select v-if="scope.row.approveStatus" v-model="scope.row.approveStatus" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+            disabled
+            :value="scope.row.approveStatus">
+            <el-option label="待决策人审核" value="待决策人审核"
+              style="color: #8890b1" />
+          </el-select>
+          <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+
+            :value="scope.row.status">
+            <el-option label="待执行" value="待执行"
+              style="color: #8890b1" />
+              <el-option label="执行中" value="执行中"
+              style="color: #8890b1" />
+          </el-select>
+            <!-- <el-popover v-else placement="left" :width="285" trigger="click" visible-arrow="false"
+              @show="history(scope.row)">
+              <template>
+                <span slot="reference">
+                  <span v-if="scope.row.status == '待执行'" class="executory"></span>
+                  <span v-if="scope.row.status == '执行中'" class="inExecution"></span>
+                  <span v-if="scope.row.status == '已完成'" class="done"></span>{{ scope.row.status }}
+                </span>
+              </template>
+              <div>
+                <p style="margin-top: 0; padding-left: 10px">操作历史</p>
+                <div v-for="(item, index) in historyList" class="flex">
+                  <div class="vertical-text vertical-text-left">
+                    {{ item.updateDate }}
+                  </div>
+                  <div>
+                    <div class="vertical-circle"></div>
+                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
+                  </div>
+                  <div class="vertical-text">
+                    {{ item.operateUser }}<br />{{ item.dealMsg }}
+                  </div>
                 </div>
               </div>
-            </div>
-          </el-popover>
-          <img v-if="!scope.row.approveStatus" width="17" height="18"
-            style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
-            @click="editClick(scope.row)" alt="" />
+            </el-popover>
+            <img v-if="!scope.row.approveStatus" width="17" height="18"
+              style="vertical-align: text-top; position: relative; top: -1px;" src="../../../public/img/edit.png"
+              @click="editClick(scope.row)" alt="" /> -->
+          </div>
+          <div v-else>
+            <!-- {{scope.row.status}} -->
+            <el-select v-model="scope.row.status" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+            :value="scope.row.status"
+          >
+            <el-option v-for="item in statusList" :key="item.value" :label="item.value" :value="item.value"
+              style="color: #8890b1" />
+          </el-select>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column prop="contractRevenue" label="合同收入"> </el-table-column>
-      <el-table-column prop="expenses" label="费用支出"> </el-table-column>
-      <el-table-column prop="mildewGrain" label="未回款(元)">
+      <el-table-column width='120' prop="signingDate" label="签订日期"> </el-table-column>
+      <el-table-column width='120' prop="contractRevenue" label="合同收入"> </el-table-column>
+      <el-table-column width='120' prop="expenses" label="费用支出"> </el-table-column>
+      <el-table-column width='120' prop="mildewGrain" label="未回款(元)">
         <template slot-scope="scope">
         <span style='color:red;' v-if='scope.row.datestatus&&scope.row.invoiced>scope.row.contractRevenue'>{{scope.row.mildewGrain}}</span>
         <span v-else>{{scope.row.mildewGrain}}</span>
@@ -219,6 +246,7 @@
         showType: true,
         // 年
         year: '',
+        currectstatus:'',
         deptBudgetTotal: 0,
         currentPage: 1,
         pageSize: 9999,
@@ -251,6 +279,9 @@
             return time.getTime() > Date.now()
           },
         },
+        statusList:[{
+          value:'已完成',
+        },{value:'发运结束',}],
         accessoryTFs: false,
         accesscard: false,
         accessurl: '',
@@ -329,6 +360,37 @@
       this.showType = this.isShow
     },
     methods: {
+      selectstatuschange(e,row){
+        var data={}
+        if(e=='发运结束'){
+          data={id: row.id,endFlag:1}
+        }else{
+          data={id: row.id}
+        }
+        this.$confirm(`是否将状态改为${e}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            editstatus(data)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '状态修改成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            row.status=row.currectstatus
+            return false
+          })
+      },
       onChange() {
         this.$refs.upload
           .handleSaveBill()
@@ -407,6 +469,9 @@
           .then((response) => {
             var date=new Date().getTime()
             for (var i = 0; i < response.records.length; i++) {
+              if(response.records[i].status){
+                response.records[i].currectstatus=response.records[i].status
+              }
               if(response.records[i].collectionDeadline){
                 response.records[i].date=new Date(response.records[i].collectionDeadline).getTime()
                 console.log(response.records[i].date,parseInt(date) + (5 * 24 * 3600 * 1000))
@@ -471,7 +536,7 @@
         var status = ''
         if (row.status == '待执行' || row.status == '已完成') {
           status = '执行中'
-        } else if (row.status == '执行中') {
+        } else if (row.status == '执行中'||row.status == '发运结束') {
           status = '已完成'
         }
         //cancelButtonClass: "btn-custom-cancel"
@@ -997,4 +1062,8 @@
   /deep/.typeselect .el-input__inner {
     color: #8890b1;
   }
+  /deep/.statusselect .el-input__inner {
+    color: #8890b1;
+    width:100%;
+  }
 </style>

+ 148 - 142
src/views/houseSelfCollect/inspectInfo.vue

@@ -113,7 +113,7 @@
             </ws-form-item>
           </ws-info-table>
 
-          <div class="title">质检数据</div>
+          <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; <el-checkbox v-if='types==1||types==3' v-model="checked">补录</el-checkbox></div>
           <ws-info-table>
             <ws-form-item label="等级" span="1" prop="grade">
               <ws-select v-model="inspect.grade" placeholder="请输入等级" class="typeselect" :disabled="disabled"
@@ -218,6 +218,7 @@
         carNumberList: [],
         disabled: false,
         disabled1: false,
+        checked:false,
         disabled2: false,
         disabled3:false,
         disabledName: false,
@@ -464,6 +465,7 @@
               inspectAdd(this.inspect)
                 .toPromise()
                 .then((response) => {
+                  this.checked=false
                   this.$message.success('保存成功')
                   getinspectLook({
                       id: response
@@ -504,6 +506,7 @@
                 .toPromise()
                 .then((response) => {
                   this.$message.success('修改成功')
+                  this.checked=false
                   this.$router.push({
                     path: 'inspectionManagement'
                   })
@@ -742,149 +745,152 @@
             return
           }
         }
-        if (!this.inspect.grade) {
-          this.$message({
-            message: '等级不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.inspect.impurity) {
-          this.$message({
-            message: '杂质不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (String(this.inspect.impurity).indexOf('.') != -1 && String(this.inspect.impurity).length - (String(this
-            .inspect.impurity).indexOf('.') + 1) > 1) {
-          this.$message({
-            message: '杂质输入错误',
-            type: 'warning',
-          })
-          return
-        }
+        if(!this.checked){
+          if (!this.inspect.grade) {
+            this.$message({
+              message: '等级不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.inspect.impurity) {
+            this.$message({
+              message: '杂质不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (String(this.inspect.impurity).indexOf('.') != -1 && String(this.inspect.impurity).length - (String(this
+              .inspect.impurity).indexOf('.') + 1) > 1) {
+            this.$message({
+              message: '杂质输入错误',
+              type: 'warning',
+            })
+            return
+          }
 
-        if (this.inspect.impurity < 0 || this.inspect.impurity > 40) {
-          this.$message({
-            message: '杂质输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if( this.information != '编辑复检'){
-        if (!this.inspect.waterContent) {
-          this.$message({
-            message: '水分不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.inspect.waterContent < 0 || this.inspect.waterContent > 50) {
-          this.$message({
-            message: '水分输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (String(this.inspect.waterContent).indexOf('.') != -1 && String(this.inspect.waterContent).length - (String(
-            this.inspect.waterContent).indexOf('.') + 1) > 1) {
-          this.$message({
-            message: '水分输入错误',
-            type: 'warning',
-          })
-          return
-        }
+          if (this.inspect.impurity < 0 || this.inspect.impurity > 40) {
+            this.$message({
+              message: '杂质输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if( this.information != '编辑复检'){
+          if (!this.inspect.waterContent) {
+            this.$message({
+              message: '水分不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.inspect.waterContent < 0 || this.inspect.waterContent > 50) {
+            this.$message({
+              message: '水分输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (String(this.inspect.waterContent).indexOf('.') != -1 && String(this.inspect.waterContent).length - (String(
+              this.inspect.waterContent).indexOf('.') + 1) > 1) {
+            this.$message({
+              message: '水分输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          }
+          
+          if (!this.inspect.mildewGrain) {
+            this.$message({
+              message: '霉变粒不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.inspect.mildewGrain < 0 || this.inspect.mildewGrain > 40) {
+            this.$message({
+              message: '霉变粒输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (String(this.inspect.mildewGrain).indexOf('.') != -1 && String(this.inspect.mildewGrain).length - (String(
+              this.inspect.mildewGrain).indexOf('.') + 1) > 1) {
+            this.$message({
+              message: '霉变粒输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.inspect.bulkDensity) {
+            this.$message({
+              message: '容重不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.inspect.bulkDensity < 500 || this.inspect.bulkDensity > 1000) {
+            this.$message({
+              message: '容重输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (String(this.inspect.bulkDensity).indexOf('.') != -1 && String(this.inspect.bulkDensity).length - (String(
+              this.inspect.bulkDensity).indexOf('.') + 1) > 0) {
+            this.$message({
+              message: '容重需输入整数',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.inspect.jiaorenli) {
+            this.$message({
+              message: '热损伤不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.inspect.jiaorenli < 0 || this.inspect.jiaorenli > 40) {
+            this.$message({
+              message: '热损伤输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (String(this.inspect.jiaorenli).indexOf('.') != -1 && String(this.inspect.jiaorenli).length - (String(this
+              .inspect.jiaorenli).indexOf('.') + 1) > 1) {
+            this.$message({
+              message: '热损伤输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.inspect.imperfectGrain) {
+            this.$message({
+              message: '不完善粒不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.inspect.imperfectGrain < 0 || this.inspect.imperfectGrain > 40) {
+            this.$message({
+              message: '不完善粒输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (String(this.inspect.imperfectGrain).indexOf('.') != -1 && String(this.inspect.imperfectGrain).length - (
+              String(this.inspect.imperfectGrain).indexOf('.') + 1) > 1) {
+            this.$message({
+              message: '不完善粒输入错误',
+              type: 'warning',
+            })
+            return
+          }
         }
         
-        if (!this.inspect.mildewGrain) {
-          this.$message({
-            message: '霉变粒不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.inspect.mildewGrain < 0 || this.inspect.mildewGrain > 40) {
-          this.$message({
-            message: '霉变粒输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (String(this.inspect.mildewGrain).indexOf('.') != -1 && String(this.inspect.mildewGrain).length - (String(
-            this.inspect.mildewGrain).indexOf('.') + 1) > 1) {
-          this.$message({
-            message: '霉变粒输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.inspect.bulkDensity) {
-          this.$message({
-            message: '容重不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.inspect.bulkDensity < 500 || this.inspect.bulkDensity > 1000) {
-          this.$message({
-            message: '容重输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (String(this.inspect.bulkDensity).indexOf('.') != -1 && String(this.inspect.bulkDensity).length - (String(
-            this.inspect.bulkDensity).indexOf('.') + 1) > 0) {
-          this.$message({
-            message: '容重需输入整数',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.inspect.jiaorenli) {
-          this.$message({
-            message: '热损伤不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.inspect.jiaorenli < 0 || this.inspect.jiaorenli > 40) {
-          this.$message({
-            message: '热损伤输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (String(this.inspect.jiaorenli).indexOf('.') != -1 && String(this.inspect.jiaorenli).length - (String(this
-            .inspect.jiaorenli).indexOf('.') + 1) > 1) {
-          this.$message({
-            message: '热损伤输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.inspect.imperfectGrain) {
-          this.$message({
-            message: '不完善粒不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.inspect.imperfectGrain < 0 || this.inspect.imperfectGrain > 40) {
-          this.$message({
-            message: '不完善粒输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (String(this.inspect.imperfectGrain).indexOf('.') != -1 && String(this.inspect.imperfectGrain).length - (
-            String(this.inspect.imperfectGrain).indexOf('.') + 1) > 1) {
-          this.$message({
-            message: '不完善粒输入错误',
-            type: 'warning',
-          })
-          return
-        }
         getamount({
             compId: localStorage.getItem('ws-pf_compId'),
             customerNumberCard: this.inspect.customerNumberCard,
@@ -1306,4 +1312,4 @@
     text-align: center;
     // margin: 20px auto;
   }
-</style>
+</style>

+ 104 - 49
src/views/houseSelfCollect/paymentManagement.vue

@@ -7,8 +7,8 @@
         <div class="print-type-title">打印凭证</div>
         <div class="print-type-checkbox">
           <el-checkbox-group v-model="ruleForm.type">
-            <el-checkbox label="打印身份证(正反面)" name="type" class="label-width" @change="selectType"></el-checkbox>
-            <el-checkbox label="打印银行卡(正反面)" name="type" class="label-width" @change="selectType"></el-checkbox>
+            <el-checkbox label="打印身份证" name="type" class="label-width" @change="selectType"></el-checkbox>
+            <el-checkbox label="打印银行卡" name="type" class="label-width" @change="selectType"></el-checkbox>
             <el-checkbox label="打印结算凭证" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
             <el-checkbox label="打印检斤单" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
             <el-checkbox label="打印回执单" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
@@ -122,9 +122,10 @@
       <el-table-column class="table_td" prop="updateDate" label="更新时间" width="150" sortable></el-table-column>
       <el-table-column class="table_td" prop="status" width="80" label="状态">
         <template scope="scope">
-          <span v-if="scope.row.approveStatus">{{
+          <span v-if="scope.row.approveStatus&&scope.row.reverseFlag!=1">{{
             scope.row.approveStatus
           }}</span>
+
           <span v-else>{{ scope.row.status }}</span>
         </template>
       </el-table-column>
@@ -134,17 +135,18 @@
           <span v-else>已开票</span>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="500">
+      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="600">
         <template scope="scope">
           <span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
             <el-button v-if="
-                (!scope.row.approveStatus ||
-                  scope.row.approveStatus == '待结算') &&
-                (scope.row.status == '待结算' || scope.row.status == '已驳回' )
+                (!scope.row.approveStatus ||scope.row.approveStatus == '待结算') &&
+                (scope.row.status == '待结算' || scope.row.status == '已驳回' )||scope.row.approveStatus&&scope.row.reverseFlag==1
               " @click="settlement(1, scope.row)">结算</el-button>
           </span>
           <el-button @click="settlement(2, scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.view`">查看
           </el-button>
+          <el-button  v-if="scope.row.approveStatus&&scope.row.reverseFlag!=1" @click="settleaccounts(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.seet`">反结算
+          </el-button>
           <el-button v-if="
               scope.row.approveStatus ||
               (scope.row.status != '待结算' && !scope.row.approveStatus)
@@ -308,7 +310,21 @@
         :preview-src-list="[paymentReceipt]">
       </el-image>
     </el-dialog>
-
+    <el-dialog width="30%" title="开票信息" :visible.sync="invoicingshow" :close="invoicingClose">
+       <el-form :label-position="labelposition" label-width="200px" style='text-align:center;' class="customer">
+        <el-form-item label="税控盘:">
+          <el-select v-model="invoiceFlag" placeholder="请选择税控盘"
+          filterable clearable style="margin: 0 10px">
+          <el-option v-for="item in invoicingList" :key="'invoicing'+item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+        </el-form-item>
+      </el-form>
+        <span slot="footer" class="dialog-footer">
+        <el-button @click="invoicingshow = false">取 消</el-button>
+        <el-button type="primary" @click="invoicingconfirm">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -333,7 +349,8 @@
     invoicing,
     export1,
     settlementEdit,
-    workflowcontent
+    workflowcontent,
+    suspendinstance
   } from '@/model/houseSelfCollect/index'
   import {
     posthandle,
@@ -354,12 +371,15 @@
         paymentReceipt: '',
         isPreviewPayOrder: false,
         printType: 0,
+        invoiceFlag:'',
         isShowPrintType1: true,
         isShowPrintType2: true,
         isShowPrintType3: true,
         isShowPrintType4: true,
         customerInfo: false,
         form: {},
+        labelposition:'right',
+        invoicingList:[{label:'航天信息',value:1},{label:'百旺',value:2}],
         formLabelWidth: '300px',
         invoicing: '',
         deleteshow: false,
@@ -369,8 +389,8 @@
 
         ruleForm: {
           type: [
-            '打印身份证(正反面)',
-            '打印银行卡(正反面)',
+            '打印身份证',
+            '打印银行卡',
             '打印结算凭证',
             '打印检斤单',
             '打印回执单'
@@ -402,6 +422,7 @@
         warehouseNameKey: '',
         warehouseName: '',
         isShowPrint: false,
+        invoicingshow:false,
         printData: {},
         warehouse: [],
         disabled: false,
@@ -439,6 +460,29 @@
       })
     },
     methods: {
+      invoicingClose(){
+        this.invoicingshow=false
+      },
+      settleaccounts(row){
+        this.$confirm('确定将该笔业务进行反结算操作?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+
+          suspendinstance({workflowId:row.workflowId,id:row.id}).toPromise()
+          .then((response) => {
+          this.$message({
+            type: 'success',
+            message: '反结算成功!'
+          }); 
+          this.getList()
+          })
+        }).catch(() => {
+          return false       
+        });
+       
+      },
       imgshow() {
         this.deleteshow = false
         console.log(11111)
@@ -583,21 +627,12 @@
           xmlhttp.send()
         })
       },
-      invoicingClick() {
-        // let data = JSON.stringify({
-        //   paymentManagementList : this.modification
-        // })
-        // //开票
-        //   invoicing(data)
-        //   .toPromise()
-        //   .then(response => {
-        //     console.log(response)
-        //   })
-
+      invoicingconfirm(){
         let data = {
           paymentManagementList: this.modification,
         }
         for (let i = 0; i < this.modification.length; i++) {
+          this.modification[i].invoiceFlag=this.invoiceFlag
           if (
             this.modification[i].status != '全部付款' &&
             this.modification[i].status != '部分付款' &&
@@ -624,6 +659,19 @@
           })
           .catch(() => {})
       },
+      invoicingClick() {
+        this.invoicingshow=true
+        // let data = JSON.stringify({
+        //   paymentManagementList : this.modification
+        // })
+        // //开票
+        //   invoicing(data)
+        //   .toPromise()
+        //   .then(response => {
+        //     console.log(response)
+        //   })
+
+      },
       customer(row) {
         getCustomerLook({
             id: row.identityId,
@@ -654,7 +702,7 @@
         } = param
         const sums = []
         var _number = []
-        if (this.warehouseName == "鲅鱼圈金信库") {
+        if (this.warehouseName == '鲅鱼圈金信库') {
           _number = [11, 12, 16, 17, 18]
         } else {
           _number = [10, 11, 15, 16, 17]
@@ -688,7 +736,7 @@
             if (index === 0) {
               sums[index] = '合计'
             } else if (index === _number[0] || index === _number[1] || index === _number[2] || index === _number[
-              3] || index === _number[4]) {
+                3] || index === _number[4]) {
               const values = data.map((item) => Number(item[column.property]))
               if (!values.every((value) => isNaN(value))) {
                 sums[index] = values.reduce((prev, curr) => {
@@ -716,10 +764,10 @@
       selectType(val) {
         for (let i = 0; i < this.ruleForm.type.length; i++) {
           switch (this.ruleForm.type[i]) {
-            case '打印身份证(正反面)':
+            case '打印身份证':
               this.isShowPrintType1 = !this.isShowPrintType1
               break
-            case '打印银行卡(正反面)':
+            case '打印银行卡':
               this.isShowPrintType2 = !this.isShowPrintType2
               break
             case '打印结算凭证':
@@ -727,13 +775,16 @@
             case '打印检斤单':
               this.isShowPrintType4 = !this.isShowPrintType4
               break
+              case '打印回执单':
+              this.isShowPrintType5 = !this.isShowPrintType5
+              break
           }
         }
       },
       typePrintCannelClick() {
         this.isShowPrintType = false
       },
-      typePrintClick(type) {
+     async typePrintClick(type) {
         // type 1批量打印 0单个打印
         //  this.isShowPrint = true
         this.selectCustomerList = []
@@ -742,7 +793,7 @@
           let index1 = 0
           let index2 = 0
           for (let i = 0; i < this.modification.length; i++) {
-            getCustomerLook({
+          await getCustomerLook({
                 id: this.modification[i].identityId,
                 authenticationStatusKey: 7,
               })
@@ -758,7 +809,7 @@
                   // this.isShowPrint = true
                   this.printBig()
                 }
-                getpaymentexamine({
+               getpaymentexamine({
                     id: this.modification[i].id,
                   })
                   .toPromise()
@@ -1222,16 +1273,18 @@
               })
               .toPromise()
               .then((response) => {
-                workflowcontent({
-                    workflowId: item.workflowId,
-                    businessKey: item.id,
-                    type: '付款管理'
-                  }).toPromise()
-                  .then((response1) => {
-                    console.log(response1)
-                    // this.$message.success('审核成功')
-                    // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
-                  })
+                if (index == 0) {
+                  workflowcontent({
+                      workflowId: item.workflowId,
+                      businessKey: item.id,
+                      type: '付款管理'
+                    }).toPromise()
+                    .then((response1) => {
+                      console.log(response1)
+                      // this.$message.success('审核成功')
+                      // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+                    })
+                }
                 this.audit(
                   this.modification[index + 1],
                   index + 1,
@@ -1249,16 +1302,18 @@
               })
               .toPromise()
               .then((response) => {
-                workflowcontent({
-                    workflowId: item.workflowId,
-                    businessKey: item.id,
-                    type: '付款管理'
-                  }).toPromise()
-                  .then((response1) => {
-                    console.log(response1)
-                    // this.$message.success('审核成功')
-                    // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
-                  })
+                if (index == 0) {
+                  workflowcontent({
+                      workflowId: item.workflowId,
+                      businessKey: item.id,
+                      type: '付款管理'
+                    }).toPromise()
+                    .then((response1) => {
+                      console.log(response1)
+                      // this.$message.success('审核成功')
+                      // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+                    })
+                }
                 // postqueryhandle({workflowId:item.workflowId}).toPromise()
                 // .then((response) => {
                 this.audit(

+ 32 - 0
src/views/houseSelfCollect/weighingManagement.vue

@@ -106,6 +106,10 @@
           <el-button :disabled="scope.row.allow == 2" @click="weightCheck(scope.row, 2)"
             v-if=" (scope.row.status == '已称毛重' || scope.row.status == '已称皮重') "
             v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
+          <div style="display: inline-block;">
+            <el-button @click="del(scope.row)" type="danger"
+              v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
+          </div>
           <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' ||scope.row.status == '已称毛重'"
             v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
         </template>
@@ -146,6 +150,7 @@
 <script>
   import {
     getweighingList,
+    getweighingDelete,
     selectWarehouseSelf,
     getPrint
   } from '@/model/houseSelfCollect/index'
@@ -476,6 +481,33 @@
         }
 
       },
+      del(row) {
+        //删除
+        this.$confirm('确定删除检斤信息?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            getweighingDelete({
+                id: row.id,
+              })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '删除成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
       find() {
         this.getList()
       },

+ 2 - 2
src/views/houseSelfCollect/weightCheck.vue

@@ -1340,7 +1340,7 @@ export default {
   display: flex;
 
   .left {
-    min-width: 500px;
+    min-width: 570px;
      position: relative;
     // padding:0 20px 20px 20px;
 
@@ -1349,7 +1349,7 @@ export default {
       color: #2aff7c;
       font-size: 32px;
       text-align: right;
-      padding: 0 20px;
+       padding: 0 10px 0 20px;
       border-radius: 10px;
       margin: 0 20px 20px 20px;
         position: absolute;

+ 13 - 9
src/views/statisticalReport/autoSettlementList.vue

@@ -884,15 +884,19 @@
             })
             .toPromise()
             .then((response) => {
-              workflowcontent({
-                  workflowId: item.workflowId,
-                  businessKey: item.id,
-                  type: '汽运结算报表'
-                }).toPromise()
-                .then((response1) => {
-                  this.audit(this.modification[index + 1], index + 1, status)
-                })
-
+              if (index == 0) {
+                workflowcontent({
+                    workflowId: item.workflowId,
+                    businessKey: item.id,
+                    type: '汽运结算报表'
+                  }).toPromise()
+                  .then((response1) => {
+                    console.log(response1)
+                    // this.$message.success('审核成功')
+                    // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+                  })
+              }
+              this.audit(this.modification[index + 1], index + 1, status)
             })
             .catch((req) => {
               this.$message.warning(req.message)

+ 12 - 8
src/views/statisticalReport/huoyunList.vue

@@ -843,14 +843,18 @@
             })
             .toPromise()
             .then((response) => {
-              workflowcontent({
-                  workflowId: item.workflowId,
-                  businessKey: item.id,
-                  type: '火运结算报表'
-                }).toPromise()
-                .then((response1) => {
-                  this.audit(this.modification[index + 1], index + 1, status)
-                })
+              if (index == 0) {
+                workflowcontent({
+                    workflowId: item.workflowId,
+                    businessKey: item.id,
+                    type: '火运结算报表'
+                  }).toPromise()
+                  .then((response1) => {
+
+                  })
+              }
+
+              this.audit(this.modification[index + 1], index + 1, status)
             })
             .catch((req) => {
               this.$message.warning(req.message)

+ 22 - 13
src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -27,8 +27,8 @@
           </el-select>
         </el-col>
       </el-row>
-      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" ref="warehouseList" height="calc(100% - 110px)"
-        border :summary-method="getSummaries" show-summary @row-click="handleRowClick"
+      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" ref="warehouseList"
+        height="calc(100% - 110px)" border :summary-method="getSummaries" show-summary @row-click="handleRowClick"
         @selection-change="handleSelectionChange">
         <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
@@ -96,7 +96,8 @@
           <el-input type='number' v-model="allmoney1" autocomplete="off" class="deal"></el-input>
         </el-form-item>
         <el-form-item label="本次收款金额(元)" :label-width="formLabelWidth">
-          <el-input type='number' v-model="collectmoney" autocomplete="off" placeholder="请输入本次收款金额" class="deal"></el-input>
+          <el-input type='number' v-model="collectmoney" autocomplete="off" placeholder="请输入本次收款金额" class="deal">
+          </el-input>
         </el-form-item>
         <el-form-item label="收款日期" prop="submissionDate" :label-width="formLabelWidth" class="deal">
           <ws-date-picker v-model="collectionDate" type="date" placeholder="请选择收款日期" value-format="yyyy-MM-dd"
@@ -320,11 +321,19 @@
             })
             .toPromise()
             .then((response) => {
-              workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'采购平仓报表'}).toPromise()
-            .then((response1) => {
+              if (index == 0) {
+                workflowcontent({
+                    workflowId: item.workflowId,
+                    businessKey: item.id,
+                    type: '采购平仓报表'
+                  }).toPromise()
+                  .then((response1) => {
+
+                  })
+              }
+
               this.audit(this.modification[index + 1], index + 1, status)
             })
-            })
             .catch((req) => {
               this.$message.warning(req.message)
             })
@@ -407,25 +416,25 @@
             sums[index] = '--'
           }
         })
-        if(typeof sums[sums.length - 5] =='number'){
+        if (typeof sums[sums.length - 5] == 'number') {
           sums[sums.length - 5] = sums[sums.length - 5].toFixed(2)
         }
-        if(typeof sums[sums.length - 6] =='number'){
+        if (typeof sums[sums.length - 6] == 'number') {
           sums[sums.length - 6] = sums[sums.length - 6].toFixed(2)
         }
-        if(typeof sums[sums.length - 7] =='number'){
+        if (typeof sums[sums.length - 7] == 'number') {
           sums[sums.length - 7] = sums[sums.length - 7].toFixed(2)
         }
-        if(typeof sums[sums.length - 9] =='number'){
+        if (typeof sums[sums.length - 9] == 'number') {
           sums[sums.length - 9] = sums[sums.length - 9].toFixed(2)
         }
-        if(typeof sums[sums.length - 10] =='number'){
+        if (typeof sums[sums.length - 10] == 'number') {
           sums[sums.length - 10] = sums[sums.length - 10].toFixed(2)
         }
-        if(typeof sums[sums.length - 11] =='number'){
+        if (typeof sums[sums.length - 11] == 'number') {
           sums[sums.length - 11] = sums[sums.length - 11].toFixed(2)
         }
-        if(typeof sums[sums.length - 15] =='number'){
+        if (typeof sums[sums.length - 15] == 'number') {
           sums[sums.length - 15] = sums[sums.length - 15].toFixed(2)
         }
         return sums

+ 16 - 9
src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -653,12 +653,19 @@
             })
             .toPromise()
             .then((response) => {
-              
-              workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'采购入库报表'}).toPromise()
-            .then((response1) => {
+              if (index == 0) {
+                workflowcontent({
+                    workflowId: item.workflowId,
+                    businessKey: item.id,
+                    type: '采购入库报表'
+                  }).toPromise()
+                  .then((response1) => {
+
+                  })
+              }
+
               this.audit(this.modification[index + 1], index + 1, status, status2, reason)
             })
-            })
             .catch((req) => {
               this.$message.warning(req.message)
             })
@@ -862,19 +869,19 @@
           }
         })
         console.log(sums)
-        if(typeof sums[sums.length - 2] =='number'){
+        if (typeof sums[sums.length - 2] == 'number') {
           sums[sums.length - 2] = sums[sums.length - 2].toFixed(2)
         }
-        if(typeof sums[sums.length - 9] =='number'){
+        if (typeof sums[sums.length - 9] == 'number') {
           sums[sums.length - 9] = sums[sums.length - 9].toFixed(2)
         }
-        if(typeof sums[sums.length - 10] =='number'){
+        if (typeof sums[sums.length - 10] == 'number') {
           sums[sums.length - 10] = sums[sums.length - 10].toFixed(2)
         }
-        if(typeof sums[sums.length - 11] =='number'){
+        if (typeof sums[sums.length - 11] == 'number') {
           sums[sums.length - 11] = sums[sums.length - 11].toFixed(2)
         }
-        if(typeof sums[sums.length - 2] =='number'){
+        if (typeof sums[sums.length - 2] == 'number') {
           sums[sums.length - 12] = sums[sums.length - 12].toFixed(2)
         }
         return sums

+ 11 - 8
src/views/statisticalReport/salesClosingCashierList.vue

@@ -287,15 +287,18 @@
             })
             .toPromise()
             .then((response) => {
-              workflowcontent({
-                  workflowId: item.workflowId,
-                  businessKey: item.id,
-                  type: '销售平仓报表'
-                }).toPromise()
-                .then((response1) => {
-                  this.audit(this.multipleSelection[index + 1], index + 1, status)
-                })
+              if (index == 0) {
+                workflowcontent({
+                    workflowId: item.workflowId,
+                    businessKey: item.id,
+                    type: '销售平仓报表'
+                  }).toPromise()
+                  .then((response1) => {
+
+                  })
+              }
 
+              this.audit(this.multipleSelection[index + 1], index + 1, status)
             })
             .catch((req) => {
               this.$message.warning(req.message)

+ 12 - 8
src/views/statisticalReport/salesDeliveryReportList.vue

@@ -376,14 +376,18 @@
             })
             .toPromise()
             .then((response) => {
-              workflowcontent({
-                  workflowId: item.workflowId,
-                  businessKey: item.id,
-                  type: '销售出库报表'
-                }).toPromise()
-                .then((response1) => {
-                  this.audit(this.modification[index + 1], index + 1, status)
-                })
+              if (index == 0) {
+                workflowcontent({
+                    workflowId: item.workflowId,
+                    businessKey: item.id,
+                    type: '销售出库报表'
+                  }).toPromise()
+                  .then((response1) => {
+
+                  })
+              }
+
+              this.audit(this.modification[index + 1], index + 1, status)
             })
             .catch((req) => {
               this.$message.warning(req.message)

+ 11 - 9
src/views/statisticalReport/shippingList.vue

@@ -813,15 +813,17 @@
             })
             .toPromise()
             .then((response) => {
-              workflowcontent({
-                  workflowId: item.workflowId,
-                  businessKey: item.id,
-                  type: '船运结算报表'
-                }).toPromise()
-                .then((response1) => {
-                  this.audit(this.warehouseList.records[index + 1], index + 1, status)
-                })
-
+              if (index == 0) {
+                workflowcontent({
+                    workflowId: item.workflowId,
+                    businessKey: item.id,
+                    type: '船运结算报表'
+                  }).toPromise()
+                  .then((response1) => {
+
+                  })
+              }
+              this.audit(this.warehouseList.records[index + 1], index + 1, status)
             })
             .catch((req) => {
               this.$message.warning(req.message)

+ 19 - 17
src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -591,7 +591,7 @@
             }
             this.amountNotPayable += this.modification[i].amountNotPayable
           }
-          this.amountNotPayable =this.amountNotPayable.toFixed(3)
+          this.amountNotPayable = this.amountNotPayable.toFixed(3)
           this.dialogFormVisible1 = true
         }
       },
@@ -705,21 +705,23 @@
             })
             .toPromise()
             .then((response) => {
-
-              workflowcontent({
-                  workflowId: item.workflowId,
-                  businessKey: item.id,
-                  type: '现货采购入库报表'
-                }).toPromise()
-                .then((response1) => {
-                  this.audit(
-                    this.modification[index + 1],
-                    index + 1,
-                    status,
-                    status2,
-                    reason
-                  )
-                })
+              if (index == 0) {
+                workflowcontent({
+                    workflowId: item.workflowId,
+                    businessKey: item.id,
+                    type: '现货采购入库报表'
+                  }).toPromise()
+                  .then((response1) => {
+
+                  })
+              }
+              this.audit(
+                this.modification[index + 1],
+                index + 1,
+                status,
+                status2,
+                reason
+              )
             })
             .catch((req) => {
               this.$message.warning(req.message)
@@ -1360,4 +1362,4 @@
     width: 430px;
     margin-left: 15px;
   }
-  </style>
+</style>

+ 1058 - 1403
src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -6,77 +6,47 @@
         <h2 class="bg-left title">审核出入库任务</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="returnsales()"
-        >
-          <img
-            width="6"
-            height="10"
-            style="vertical-align: bottom; margin-right: 3px"
-            src="../../../public/img/lujing.png"
-            alt
-          />返回
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
+          <img width="6" height="10" style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png" alt />返回
         </el-button>
       </el-col>
     </el-row>
     <div class="basicInformation">
       <div class="annu">
-        <el-radio-group
-          @change="tasktypechange"
-          v-model="dataList.taskTypeKey"
-        ></el-radio-group>
+        <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey"></el-radio-group>
         <div class="nav">
           <span class="ziti">
             任务类型:
-            <h1
-              class="ziti1"
-              v-show="
+            <h1 class="ziti1" v-show="
                 dataList.inOutType == '移库入库' ||
                 dataList.inOutType == '移库出库'
-              "
-            >
+              ">
               移库任务
             </h1>
-            <h1
-              class="ziti1"
-              v-show="
+            <h1 class="ziti1" v-show="
                 dataList.inOutType == '销售出库' ||
                 dataList.inOutType == '暂存出库' ||
                 dataList.inOutType == '贸易服务出库' ||
                 dataList.inOutType == '采购出库'
-              "
-            >
+              ">
               出库任务
             </h1>
-            <h1
-              class="ziti1"
-              v-show="
+            <h1 class="ziti1" v-show="
                 dataList.inOutType == '采购入库' ||
                 dataList.inOutType == '暂存入库' ||
                 dataList.inOutType == '贸易服务入库' ||
                 dataList.inOutType == '退库'
-              "
-            >
+              ">
               入库任务
             </h1>
           </span>
         </div>
       </div>
       <div class="ding"></div>
-      <div
-        v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4"
-        class="center1"
-      >
-        <img
-          style="position: relative; top: 40px; left: 300px"
-          width="19"
-          height="19"
-          src="../../../public/img/cangku.png"
-          alt
-        />
+      <div v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4" class="center1">
+        <img style="position: relative; top: 40px; left: 300px" width="19" height="19"
+          src="../../../public/img/cangku.png" alt />
         <!--出库=-->
         <div class="small-title">
           <h3>出库任务({{ dataList.inOutTaskNo }})</h3>
@@ -84,175 +54,80 @@
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
-            <el-select
-              disabled
-              v-model="dataList.warehouseName"
-              placeholder="请选择仓库名"
-              class="typeselect"
-              @change="selectwarehouseName"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in warehouseNameList"
-                :key="item.constKey"
-                :label="item.warehouseName"
-                :value="item.warehouseName"
-              />
+            <el-select disabled v-model="dataList.warehouseName" placeholder="请选择仓库名" class="typeselect"
+              @change="selectwarehouseName" filterable clearable>
+              <el-option v-for="item in warehouseNameList" :key="item.constKey" :label="item.warehouseName"
+                :value="item.warehouseName" />
             </el-select>
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="出库类型">
-            <el-select
-              disabled
-              v-model="dataList.inOutType"
-              placeholder="请选择出库类型"
-              class="typeselect"
-              @change="selectstorageType"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in storageType"
-                :key="item.constKey"
-                v-if="
+            <el-select disabled v-model="dataList.inOutType" placeholder="请选择出库类型" class="typeselect"
+              @change="selectstorageType" filterable clearable>
+              <el-option v-for="item in storageType" :key="item.constKey" v-if="
                   (dataList.taskTypeKey == 1 &&
                     item.constValue != '移库出库') ||
                   (dataList.taskTypeKey == 3 &&
                     item.constValue == '移库出库') ||
                   (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
-                "
-                :label="item.constValue"
-                :value="item.constValue"
-              />
+                " :label="item.constValue" :value="item.constValue" />
             </el-select>
           </el-form-item>
           <!-- 合同编号 -->
           <el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
-            <el-select
-              disabled
-              @change="changecontract"
-              v-model="dataList.contractNo"
-              placeholder="请输入合同编号"
-              class="typeselect"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in contractNoList"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              ></el-option>
+            <el-select disabled @change="changecontract" v-model="dataList.contractNo" placeholder="请输入合同编号"
+              class="typeselect" filterable clearable>
+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+                :value="item.contractNo"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
-            <el-select
-              disabled
-              @change="selectTaskNo"
-              v-model="dataList.moveTaskNo"
-              placeholder="请输入移库任务编号"
-              class="typeselect"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in contractNoList"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              ></el-option>
+            <el-select disabled @change="selectTaskNo" v-model="dataList.moveTaskNo" placeholder="请输入移库任务编号"
+              class="typeselect" filterable clearable>
+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+                :value="item.contractNo"></el-option>
             </el-select>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
-            <el-select
-              disabled
-              v-model="dataList.goodsName"
-              placeholder="货名"
-              class="huom"
-              @change="selectgoodsName"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              ></el-option>
+            <el-select disabled v-model="dataList.goodsName" placeholder="货名" class="huom" @change="selectgoodsName"
+              filterable clearable>
+              <el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
+                :value="item.constValue"></el-option>
             </el-select>
           </el-form-item>
           <!--重量(吨)-->
           <el-form-item label="重量(吨)">
-            <el-input
-              disabled
-              v-model="dataList.weight"
-              placeholder="请输入重量(吨)"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input disabled v-model="dataList.weight" placeholder="请输入重量(吨)" maxlength="120" size="small"
+              class="huom" />
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select
-              v-model="dataList.grade"
-              placeholder
-              class="typeselect"
-              @change="selectpackingMethod"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
+            <el-select v-model="dataList.grade" placeholder class="typeselect" @change="selectpackingMethod" filterable
+              clearable>
+              <el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
+                :value="item.constValue" />
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
           <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
-            <el-input
-              @input="bulkDensitychange"
-              v-model="dataList.bulkDensity"
-              placeholder="请输入容重"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="bulkDensitychange" v-model="dataList.bulkDensity" placeholder="请输入容重" maxlength="120"
+              size="small" class="huom" />
           </el-form-item>
           <!--水分(%)<=-->
           <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分(%)<=">
-            <el-input
-              @input="waterContentchange"
-              v-model="dataList.waterContent"
-              placeholder="请输入水分占比"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="waterContentchange" v-model="dataList.waterContent" placeholder="请输入水分占比" maxlength="120"
+              size="small" class="huom" />
           </el-form-item>
           <!--单价(元/吨)-->
           <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
-            <el-input
-              @input="unitPricechange"
-              v-model="dataList.unitPrice"
-              placeholder="请输入单价"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="unitPricechange" v-model="dataList.unitPrice" placeholder="请输入单价" maxlength="120"
+              size="small" class="huom" />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item
-            label="预计出库日期"
-            span="1"
-            prop="predictDate"
-            class="deliverydate"
-          >
-            <el-date-picker
-              disabled
-              v-model="dataList.predictDate"
-              type="date"
-              placeholder="请选择预计出库日期"
-              value-format="yyyy-MM-dd"
-            />
+          <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
+            <el-date-picker disabled v-model="dataList.predictDate" type="date" placeholder="请选择预计出库日期"
+              value-format="yyyy-MM-dd" />
           </el-form-item>
           <!--预估运费(元/吨)-->
           <!-- <el-form-item label="预估运费(元/吨)" span="1">
@@ -265,48 +140,21 @@
           </el-form-item> -->
           <!--收货人-->
           <el-form-item label="发货人">
-            <el-select
-              disabled
-              v-model="dataList.agent"
-              placeholder="请选择发货人"
-              @change="selectstaff"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
+            <el-select disabled v-model="dataList.agent" placeholder="请选择发货人" @change="selectstaff" filterable
+              clearable>
+              <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
           </el-form-item>
           <!--业务描述=-->
-          <el-form-item
-            v-if="dataList.taskTypeKey != 3"
-            label="业务描述"
-            span="1"
-          >
-            <el-input
-              v-model="dataList.businessDescribe"
-              placeholder="请输入业务描述,不超过150字"
-              maxlength="150"
-              size="large"
-              class="yewu"
-            />
+          <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="1">
+            <el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述,不超过150字" maxlength="150" size="large"
+              class="yewu" />
           </el-form-item>
           <el-form-item label="仓位号(选填)" span="1">
-             <el-select
-              v-model="dataList.binNumber"
-              placeholder="请输入仓位号"
-              filterable clearable
-              @change="binNumberChange1"
-            >
-              <el-option
-                v-for="(item, index) in binNumberList1"
-                :Key="index"
-                :label="item.binNumber"
-                :value="item.binNumber"
-              >
+            <el-select v-model="dataList.binNumber" placeholder="请输入仓位号" filterable clearable
+              @change="binNumberChange1">
+              <el-option v-for="(item, index) in binNumberList1" :Key="index" :label="item.binNumber"
+                :value="item.binNumber">
               </el-option>
             </el-select>
             <!-- <el-input
@@ -320,201 +168,91 @@
         </el-form>
       </div>
       <div v-show="dataList.taskTypeKey != 1" class="center1">
-        <img
-          style="position: relative; top: 40px; left: 300px"
-          width="19"
-          height="19"
-          src="../../../public/img/cangku.png"
-          alt
-        />
+        <img style="position: relative; top: 40px; left: 300px" width="19" height="19"
+          src="../../../public/img/cangku.png" alt />
         <div class="small-title">
           <h3>
             入库任务({{ dataList1.inOutTaskNo }})
             <span v-if="deletetask" style="color: red">已删除</span>
           </h3>
         </div>
-        <el-form
-          v-if="!deletetask"
-          ref="form"
-          :model="form"
-          label-width="140px"
-        >
+        <el-form v-if="!deletetask" ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名" v-if="dataList1.inOutType == '移库入库'">
-            <el-select
-              disabled
-              v-model="dataList1.warehouseName"
-              placeholder="请选择仓库名"
-              class="typeselect"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in warehouseNameList"
-                :key="item.constKey"
-                :label="item.warehouseName"
-                :value="item.warehouseName"
-              />
+            <el-select disabled v-model="dataList1.warehouseName" placeholder="请选择仓库名" class="typeselect" filterable
+              clearable>
+              <el-option v-for="item in warehouseNameList" :key="item.constKey" :label="item.warehouseName"
+                :value="item.warehouseName" />
             </el-select>
           </el-form-item>
           <!-- 出库类型 -->
-          <el-form-item
-            label="入库类型"
-            v-if="dataList1.inOutType == '移库入库'"
-          >
-            <el-select
-              disabled
-              v-model="dataList1.inOutType"
-              placeholder="请选择入库类型"
-              class="typeselect"
-              @change="selectstorageType1"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in storageType1"
-                :key="item.constKey"
-                v-if="
+          <el-form-item label="入库类型" v-if="dataList1.inOutType == '移库入库'">
+            <el-select disabled v-model="dataList1.inOutType" placeholder="请选择入库类型" class="typeselect"
+              @change="selectstorageType1" filterable clearable>
+              <el-option v-for="item in storageType1" :key="item.constKey" v-if="
                   (dataList1.taskTypeKey == 2 &&
                     item.constValue != '移库入库') ||
                   (dataList1.taskTypeKey == 3 &&
                     item.constValue == '移库入库') ||
                   (dataList1.taskTypeKey == 4 && item.constValue == '退库')
-                "
-                :label="item.constValue"
-                :value="item.constValue"
-              />
+                " :label="item.constValue" :value="item.constValue" />
             </el-select>
           </el-form-item>
           <!-- 合同编号 -->
           <el-form-item v-if="dataList1.taskTypeKey != 3" label="合同编号">
-            <el-select
-              disabled
-              @change="changecontract1"
-              v-model="dataList1.contractNo"
-              placeholder="请输入合同编号"
-              class="typeselect"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in contractNoList"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              ></el-option>
+            <el-select disabled @change="changecontract1" v-model="dataList1.contractNo" placeholder="请输入合同编号"
+              class="typeselect" filterable clearable>
+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+                :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"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in contractNoList"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              ></el-option>
+            <el-select disabled v-model="dataList1.moveTaskNo" placeholder="请输入移库任务编号" class="typeselect" filterable
+              clearable>
+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+                :value="item.contractNo"></el-option>
             </el-select>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
-            <el-select
-              disabled
-              v-model="dataList1.goodsName"
-              placeholder="货名"
-              class="huom"
-              @change="selectgoodsName1"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              ></el-option>
+            <el-select disabled v-model="dataList1.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1"
+              filterable clearable>
+              <el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
+                :value="item.constValue"></el-option>
             </el-select>
           </el-form-item>
           <!--重量(吨)-->
           <el-form-item label="重量(吨)">
-            <el-input
-              @input="weightchange"
-              v-model="dataList1.weight"
-              placeholder="请输入重量(吨)"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量(吨)" maxlength="120"
+              size="small" class="huom" />
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select
-              :disabled="dataList.taskTypeKey == 3"
-              v-model="dataList1.grade"
-              placeholder
-              class="typeselect"
-              @change="selectpackingMethod1"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
+            <el-select :disabled="dataList.taskTypeKey == 3" v-model="dataList1.grade" placeholder class="typeselect"
+              @change="selectpackingMethod1" filterable clearable>
+              <el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
+                :value="item.constValue" />
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
           <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
-            <el-input
-              @input="bulkDensitychange"
-              :disabled="dataList.taskTypeKey == 3"
-              v-model="dataList1.bulkDensity"
-              placeholder="请输入容重"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="bulkDensitychange" :disabled="dataList.taskTypeKey == 3" v-model="dataList1.bulkDensity"
+              placeholder="请输入容重" maxlength="120" size="small" class="huom" />
           </el-form-item>
           <!--水分(%)<=-->
           <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分(%)<=">
-            <el-input
-              @input="waterContentchange"
-              :disabled="dataList.taskTypeKey == 3"
-              v-model="dataList1.waterContent"
-              placeholder="请输入水分占比"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="waterContentchange" :disabled="dataList.taskTypeKey == 3" v-model="dataList1.waterContent"
+              placeholder="请输入水分占比" maxlength="120" size="small" class="huom" />
           </el-form-item>
           <!--单价(元/吨)-->
           <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
-            <el-input
-              @input="unitPricechange"
-              :disabled="dataList.taskTypeKey == 3"
-              v-model="dataList1.unitPrice"
-              placeholder="请输入单价"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="unitPricechange" :disabled="dataList.taskTypeKey == 3" v-model="dataList1.unitPrice"
+              placeholder="请输入单价" maxlength="120" size="small" class="huom" />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item
-            label="预计入库日期"
-            span="1"
-            prop="predictDate"
-            class="deliverydate"
-          >
-            <el-date-picker
-              disabled
-              v-model="dataList1.predictDate"
-              type="date"
-              placeholder="请选择预计入库日期"
-              value-format="yyyy-MM-dd"
-            />
+          <el-form-item label="预计入库日期" span="1" prop="predictDate" class="deliverydate">
+            <el-date-picker disabled v-model="dataList1.predictDate" type="date" placeholder="请选择预计入库日期"
+              value-format="yyyy-MM-dd" />
           </el-form-item>
           <!--预估运费(元/吨)-->
           <!-- <el-form-item label="预估运费(元/吨)" span="1">
@@ -527,44 +265,20 @@
           </el-form-item> -->
           <!--收货人-->
           <el-form-item label="收货人">
-            <el-select
-              disabled
-              v-model="dataList1.agent"
-              placeholder="请选择收货人"
-              filterable
-              @change="selectstaff1"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
+            <el-select disabled v-model="dataList1.agent" placeholder="请选择收货人" filterable @change="selectstaff1"
+              filterable clearable>
+              <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
           </el-form-item>
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
-            <el-input
-              v-model="dataList1.businessDescribe"
-              placeholder="请输入业务描述,不超过150字"
-              maxlength="150"
-              size="large"
-            />
+            <el-input v-model="dataList1.businessDescribe" placeholder="请输入业务描述,不超过150字" maxlength="150" size="large" />
           </el-form-item>
           <el-form-item label="仓位号(选填)" span="1">
-            <el-select
-              v-model="dataList1.binNumber"
-              placeholder="请输入仓位号"
-              @change="binNumberChange"
-              filterable clearable
-            >
-              <el-option
-                v-for="(item, index) in binNumberList"
-                :Key="index"
-                :label="item.binNumber"
-                :value="item.binNumber"
-              >
+            <el-select v-model="dataList1.binNumber" placeholder="请输入仓位号" @change="binNumberChange" filterable
+              clearable>
+              <el-option v-for="(item, index) in binNumberList" :Key="index" :label="item.binNumber"
+                :value="item.binNumber">
               </el-option>
             </el-select>
             <!-- <el-input
@@ -580,184 +294,87 @@
       <div v-if="dataList.taskTypeKey == 4" class="center1">
         <!--出库=-->
         <div class="small-title">
-          <img
-            style="position: relative; top: 40px; left: -22px"
-            width="19"
-            height="19"
-            src="../../../public/img/cangku.png"
-            alt
-          />
+          <img style="position: relative; top: 40px; left: -22px" width="19" height="19"
+            src="../../../public/img/cangku.png" alt />
           <h3>出库任务({{ inOutTaskNo }})</h3>
         </div>
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
-            <el-select
-              disabled
-              v-model="dataList.warehouseName"
-              placeholder="请选择仓库名"
-              class="typeselect"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in warehouseNameList"
-                :key="item.constKey"
-                :label="item.warehouseName"
-                :value="item.warehouseName"
-              />
+            <el-select disabled v-model="dataList.warehouseName" placeholder="请选择仓库名" class="typeselect" filterable
+              clearable>
+              <el-option v-for="item in warehouseNameList" :key="item.constKey" :label="item.warehouseName"
+                :value="item.warehouseName" />
             </el-select>
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="出库类型">
-            <el-select
-              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
-              v-model="dataList.inOutType"
-              placeholder="请选择出库类型"
-              class="typeselect"
-              @change="selectstorageType"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in storageType"
-                :key="item.constKey"
-                v-if="
+            <el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.inOutType"
+              placeholder="请选择出库类型" class="typeselect" @change="selectstorageType" filterable clearable>
+              <el-option v-for="item in storageType" :key="item.constKey" v-if="
                   (dataList.taskTypeKey == 1 &&
                     item.constValue != '移库出库') ||
                   (dataList.taskTypeKey == 3 &&
                     item.constValue == '移库出库') ||
                   (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
-                "
-                :label="item.constValue"
-                :value="item.constValue"
-              />
+                " :label="item.constValue" :value="item.constValue" />
             </el-select>
           </el-form-item>
           <!-- 合同编号 -->
           <el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
-            <el-select
-              disabled
-              v-model="dataList.contractNo"
-              placeholder="请输入合同编号"
-              class="typeselect"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in contractNoList"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              ></el-option>
+            <el-select disabled v-model="dataList.contractNo" placeholder="请输入合同编号" class="typeselect" filterable
+              clearable>
+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+                :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"
-                :value="item.contractNo"
-              ></el-option>
+            <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"
+                :value="item.contractNo"></el-option>
             </el-select>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
-            <el-select
-              disabled
-              v-model="dataList.goodsName"
-              placeholder="货名"
-              class="huom"
-              @change="selectgoodsName"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              ></el-option>
+            <el-select disabled v-model="dataList.goodsName" placeholder="货名" class="huom" @change="selectgoodsName"
+              filterable clearable>
+              <el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
+                :value="item.constValue"></el-option>
             </el-select>
           </el-form-item>
           <!--重量(吨)-->
           <el-form-item label="重量(吨)">
-            <el-input
-              disabled
-              v-model="dataList.weight"
-              placeholder="请输入重量(吨)"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input disabled v-model="dataList.weight" placeholder="请输入重量(吨)" maxlength="120" size="small"
+              class="huom" />
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select
-              disabled
-              v-model="dataList.grade"
-              placeholder
-              class="typeselect"
-              @change="selectpackingMethod"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
+            <el-select disabled v-model="dataList.grade" placeholder class="typeselect" @change="selectpackingMethod"
+              filterable clearable>
+              <el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
+                :value="item.constValue" />
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
           <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
-            <el-input
-              disabled
-              v-model="dataList.bulkDensity"
-              placeholder="请输入容重"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input disabled v-model="dataList.bulkDensity" placeholder="请输入容重" maxlength="120" size="small"
+              class="huom" />
           </el-form-item>
           <!--水分(%)<=-->
           <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分(%)<=">
-            <el-input
-              disabled
-              v-model="dataList.waterContent"
-              placeholder="请输入水分占比"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input disabled v-model="dataList.waterContent" placeholder="请输入水分占比" maxlength="120" size="small"
+              class="huom" />
           </el-form-item>
           <!--单价(元/吨)-->
           <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
-            <el-input
-              disabled
-              v-model="dataList.unitPrice"
-              placeholder="请输入单价"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input disabled v-model="dataList.unitPrice" placeholder="请输入单价" maxlength="120" size="small"
+              class="huom" />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item
-            label="预计出库日期"
-            span="1"
-            prop="predictDate"
-            class="deliverydate"
-          >
-            <el-date-picker
-              v-model="dataList.predictDate"
-              type="date"
-              placeholder="请选择预计出库日期"
-              value-format="yyyy-MM-dd"
-            />
+          <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
+            <el-date-picker v-model="dataList.predictDate" type="date" placeholder="请选择预计出库日期"
+              value-format="yyyy-MM-dd" />
           </el-form-item>
           <!--预估运费(元/吨)-->
           <!-- <el-form-item label="预估运费(元/吨)" span="1">
@@ -770,28 +387,13 @@
           </el-form-item> -->
           <!--发货人-->
           <el-form-item label="发货人">
-            <el-select
-              v-model="dataList.agent"
-              placeholder="请选择发货人"
-              @change="selectstaff"
-              filterable clearable
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
+            <el-select v-model="dataList.agent" placeholder="请选择发货人" @change="selectstaff" filterable clearable>
+              <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-input
-              v-model="dataList.businessDescribe"
-              placeholder="请输入业务描述,不超过150字"
-              maxlength="150"
-              size="large"
-            />
+            <el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述,不超过150字" maxlength="150" size="large" />
           </el-form-item>
         </el-form>
       </div>
@@ -799,23 +401,11 @@
 
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="reject()"
-        >驳回</el-button
-      >
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
-        >通过</el-button
-      >
+      <el-button class="bg-bottom" type="primary" size="small" @click="reject()">驳回</el-button>
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()">通过</el-button>
     </div>
-    <el-table
-      class="wenzi"
-      :data="taskhistories"
-      style="width: 80%"
-      height="180"
-    >
-      <el-table-column
-        prop="operatorMajorRoleName"
-        label="审核人"
-      ></el-table-column>
+    <el-table class="wenzi" :data="taskhistories" style="width: 80%" height="180">
+      <el-table-column prop="operatorMajorRoleName" label="审核人"></el-table-column>
       <el-table-column prop="inOutTaskNo" label="审核结果">
         <template scope="scope">
           <span v-if="scope.row.approved">通过</span>
@@ -825,18 +415,8 @@
       <el-table-column prop="createTime" label="审核时间"></el-table-column>
       <el-table-column prop="auditMind" label="审核意见"></el-table-column>
     </el-table>
-    <WinseaContentModal
-      v-model="outerVisible"
-      title="驳回原因"
-      @on-cancel="handleClose"
-    >
-      <el-input
-        type="textarea"
-        :rows="2"
-        maxlength="30"
-        placeholder="请输入驳回原因,1~30个字"
-        v-model="auditMind"
-      ></el-input>
+    <WinseaContentModal v-model="outerVisible" title="驳回原因" @on-cancel="handleClose">
+      <el-input type="textarea" :rows="2" maxlength="30" placeholder="请输入驳回原因,1~30个字" v-model="auditMind"></el-input>
       <div class="dialog-footer">
         <el-button @click="outerVisible = false">取 消</el-button>
         <el-button type="primary" @click="disableReasons">确定</el-button>
@@ -845,889 +425,964 @@
   </div>
 </template>
 <script>
-import {
-  getwarehousename,
-  xialaNo,
-  outexamine,
-  getGoodsName,
-  warehousetask,
-  woekflowhandle,
-  gettaskhistories,
-  workflowcontent
-} from '@/model/tasksport/index'
-import { pullDown, getstaff } from '@/model/warehouse/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-// import { dayjs, fmoney, EventBus } from 'base-core-lib'
-import { dayjs, EventBus } from 'base-core-lib'
-import { mapGetters } from 'vuex'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    // vesselId(val) {
-    //   this.getList()
-    // },
-    isShow(val) {
-      this.showType = val
+  import {
+    getwarehousename,
+    xialaNo,
+    outexamine,
+    getGoodsName,
+    warehousetask,
+    woekflowhandle,
+    gettaskhistories,
+    workflowcontent
+  } from '@/model/tasksport/index'
+  import {
+    pullDown,
+    getstaff
+  } from '@/model/warehouse/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  // import { dayjs, fmoney, EventBus } from 'base-core-lib'
+  import {
+    dayjs,
+    EventBus
+  } from 'base-core-lib'
+  import {
+    mapGetters
+  } from 'vuex'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-  },
-  computed: {
-    ...mapGetters(['deptBudgetList']),
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      // 是否显示
-      showType: true,
-      disabled: false,
-      // 年
-      year: '',
-      disableReason: '',
-      contractNoList: [],
-      deptBudgetTotal: 0,
-      readonly: true,
-      currentPage: 1,
-      pageSize: 10,
-      searchType: 1,
-      searchKeyWord: '',
-      radio: '1',
-      contractType: 2,
-      startDate: null,
-      endDate: null,
-      taskhistories: [],
-      goodnameList: [],
-      checked: true,
-      form: {},
-      outerVisible: false,
-      staffList: [],
-      options: [],
-      storageType: [],
-      storageType1: [],
-      outContractNo: [],
-      // 提交类型
-      submitType: true,
-      status: [],
-      auditMind: '',
-      deletetask: false,
-      warehouseNameList: [],
-      warehouseNameList1: [],
-      appendixIdsAdd: '',
-      uploadSuccess: {},
-      warehouseInOutDetail: {},
-      onChange: {},
-      deptBudgetList1: [],
-      gradeList: [],
-      Pricetype:true,
-      rules: {
-        netWeight: [
-          {
+    watch: {
+      // vesselId(val) {
+      //   this.getList()
+      // },
+      isShow(val) {
+        this.showType = val
+      },
+    },
+    computed: {
+      ...mapGetters(['deptBudgetList']),
+    },
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+        // 是否显示
+        showType: true,
+        disabled: false,
+        // 年
+        year: '',
+        disableReason: '',
+        contractNoList: [],
+        deptBudgetTotal: 0,
+        readonly: true,
+        currentPage: 1,
+        pageSize: 10,
+        searchType: 1,
+        searchKeyWord: '',
+        radio: '1',
+        contractType: 2,
+        startDate: null,
+        endDate: null,
+        taskhistories: [],
+        goodnameList: [],
+        checked: true,
+        form: {},
+        outerVisible: false,
+        staffList: [],
+        options: [],
+        storageType: [],
+        storageType1: [],
+        outContractNo: [],
+        // 提交类型
+        submitType: true,
+        status: [],
+        auditMind: '',
+        deletetask: false,
+        warehouseNameList: [],
+        warehouseNameList1: [],
+        appendixIdsAdd: '',
+        uploadSuccess: {},
+        warehouseInOutDetail: {},
+        onChange: {},
+        deptBudgetList1: [],
+        gradeList: [],
+        Pricetype: true,
+        rules: {
+          netWeight: [{
             required: true,
             type: 'number',
             message: '请输入活动名称',
             trigger: 'blur',
+          }, ],
+        },
+        size: 10,
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        packtypeList: {},
+        date: {
+          year: dayjs().format('YYYY'),
+          month: dayjs().format('MM'),
+        },
+        contractList: [],
+        inOutTaskNo: '',
+        inOutTaskNo1: '',
+        dataList: {
+          taskTypeKey: '1'
+        },
+        dataList1: {
+          taskTypeKey: '1'
+        },
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
           },
-        ],
-      },
-      size: 10,
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      packtypeList: {},
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
-      },
-      contractList: [],
-      inOutTaskNo: '',
-      inOutTaskNo1: '',
-      dataList: { taskTypeKey: '1' },
-      dataList1: { taskTypeKey: '1' },
-      historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
         },
-      },
-      binNumberList: [],
-      binNumberList1:[],
-      accessoryTFs: false,
-    }
-  },
-  activated() {
-    this.getList()
-  },
-  methods: {
-    // 仓位号改变
-    binNumberChange(e) {
-      this.dataList1.binNumber = e
-    },
-       binNumberChange1(e) {
-      this.dataList.binNumber = e
-    },
-    //返回按钮
-    revert() {
-      this.$router.go(-1)
-    },
-    returnsales() {
-      this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
-    },
-    // 获取当前年月日
-    getdate() {
-      var date = new Date()
-      var year = date.getFullYear() //获取完整的年份(4位)
-      var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
-      var datetime = date.getDate() //获取当前日(1-31)
-      if (mouth < 10) {
-        mouth = '0' + mouth
-      }
-      if (datetime < 10) {
-        datetime = '0' + datetime
+        binNumberList: [],
+        binNumberList1: [],
+        accessoryTFs: false,
       }
-      return year + '' + mouth + datetime
     },
-    reject() {
-      this.outerVisible = true
+    activated() {
+      this.getList()
     },
-    // 随机验证码
-    verifyinit() {
-      var arr = []
-      for (var i = 48; i < 123; i++) {
-        if (i > 57 && i < 65) continue
-        if (i > 90) continue
-        arr.push(String.fromCharCode(i))
-      }
-      arr.sort(function () {
-        return Math.random() - 0.5
-      })
-      arr.length = 4
+    methods: {
+      // 仓位号改变
+      binNumberChange(e) {
+        this.dataList1.binNumber = e
+      },
+      binNumberChange1(e) {
+        this.dataList.binNumber = e
+      },
+      //返回按钮
+      revert() {
+        this.$router.go(-1)
+      },
+      returnsales() {
+        this.$router.push({
+          path: 'tranManagementWarehouseInOuttask'
+        })
+      },
+      // 获取当前年月日
+      getdate() {
+        var date = new Date()
+        var year = date.getFullYear() //获取完整的年份(4位)
+        var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+        var datetime = date.getDate() //获取当前日(1-31)
+        if (mouth < 10) {
+          mouth = '0' + mouth
+        }
+        if (datetime < 10) {
+          datetime = '0' + datetime
+        }
+        return year + '' + mouth + datetime
+      },
+      reject() {
+        this.outerVisible = true
+      },
+      // 随机验证码
+      verifyinit() {
+        var arr = []
+        for (var i = 48; i < 123; i++) {
+          if (i > 57 && i < 65) continue
+          if (i > 90) continue
+          arr.push(String.fromCharCode(i))
+        }
+        arr.sort(function() {
+          return Math.random() - 0.5
+        })
+        arr.length = 4
 
-      return arr.join('')
-    },
-    MathRand() {
-      var Num = ''
-      for (var i = 0; i < 4; i++) {
-        Num += Math.floor(Math.random() * 10)
-      }
-      return Num
-    },
-    selectTaskNo(e) {
-      if (this.dataList.taskTypeKey == 3) {
-        this.dataList1.moveTaskNo = e
-      }
-    },
-    dataFilter(val) {
-      // console.log(val,"名")
-      this.deptBudgetList.staffList = val
-      if (val) {
-        //val存在
-        this.options = this.staffList.filter((item) => {
-          if (
-            !!~item.staffName.indexOf(val) ||
-            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
+        return arr.join('')
+      },
+      MathRand() {
+        var Num = ''
+        for (var i = 0; i < 4; i++) {
+          Num += Math.floor(Math.random() * 10)
+        }
+        return Num
+      },
+      selectTaskNo(e) {
+        if (this.dataList.taskTypeKey == 3) {
+          this.dataList1.moveTaskNo = e
+        }
+      },
+      dataFilter(val) {
+        // console.log(val,"名")
+        this.deptBudgetList.staffList = val
+        if (val) {
+          //val存在
+          this.options = this.staffList.filter((item) => {
+            if (
+              !!~item.staffName.indexOf(val) ||
+              !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+            ) {
+              return true
+            }
+          })
+        } else {
+          //val为空时,还原数组
+          this.options = this.staffList
+        }
+      },
+      weightchange(e) {
+        if (this.dataList.taskTypeKey == 4) {
+          this.$set(this.dataList, 'weight', e)
+        }
+      },
+      bulkDensitychange(e) {
+        if (this.dataList.taskTypeKey == 4) {
+          this.$set(this.dataList, 'bulkDensity', e)
+        } else if (this.dataList1.taskTypeKey == 3) {
+          this.$set(this.dataList1, 'bulkDensity', e)
+        }
+      },
+      waterContentchange(e) {
+        if (this.dataList.taskTypeKey == 4) {
+          this.$set(this.dataList, 'waterContent', e)
+        } else if (this.dataList1.taskTypeKey == 3) {
+          this.$set(this.dataList1, 'waterContent', e)
+        }
+      },
+      unitPricechange(e) {
+        if (this.dataList.taskTypeKey == 4) {
+          this.$set(this.dataList, 'unitPrice', e)
+        } else if (this.dataList1.taskTypeKey == 3) {
+          this.$set(this.dataList1, 'unitPrice', e)
+        }
+      },
+      changecontract(e) {
+        if (this.dataList.taskTypeKey != 3) {
+          for (let i = 0; i < this.contractNoList.length; i++) {
+            if (this.contractNoList[i].contractNo == e) {
+              getGoodsName({
+                  contractId: this.contractNoList[i].id,
+                  contractNo: this.contractNoList[i].contractNo,
+                })
+                .toPromise()
+                .then((response) => {
+                  this.$set(this.dataList, 'goodsName', response.goodsName)
+                  this.$set(this.dataList, 'goodsNameKey', response.goodsNameKey)
+                  this.$set(this.dataList, 'grade', response.grade)
+                  this.$set(this.dataList, 'gradeKey', response.gradeKey)
+                  this.$set(this.dataList, 'waterContent', response.waterContent)
+                  this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
+                  // this.$set(this.dataList, 'weight', response.weight)
+                  this.$set(
+                    this.dataList,
+                    'unitPrice',
+                    response.unitContractPrice
+                  )
+                })
+            }
           }
-        })
-      } else {
-        //val为空时,还原数组
-        this.options = this.staffList
-      }
-    },
-    weightchange(e) {
-      if (this.dataList.taskTypeKey == 4) {
-        this.$set(this.dataList, 'weight', e)
-      }
-    },
-    bulkDensitychange(e) {
-      if (this.dataList.taskTypeKey == 4) {
-        this.$set(this.dataList, 'bulkDensity', e)
-      } else if (this.dataList1.taskTypeKey == 3) {
-        this.$set(this.dataList1, 'bulkDensity', e)
-      }
-    },
-    waterContentchange(e) {
-      if (this.dataList.taskTypeKey == 4) {
-        this.$set(this.dataList, 'waterContent', e)
-      } else if (this.dataList1.taskTypeKey == 3) {
-        this.$set(this.dataList1, 'waterContent', e)
-      }
-    },
-    unitPricechange(e) {
-      if (this.dataList.taskTypeKey == 4) {
-        this.$set(this.dataList, 'unitPrice', e)
-      } else if (this.dataList1.taskTypeKey == 3) {
-        this.$set(this.dataList1, 'unitPrice', e)
-      }
-    },
-    changecontract(e) {
-      if (this.dataList.taskTypeKey != 3) {
-        for (let i = 0; i < this.contractNoList.length; i++) {
-          if (this.contractNoList[i].contractNo == e) {
-            getGoodsName({
-              contractId: this.contractNoList[i].id,
-              contractNo: this.contractNoList[i].contractNo,
-            })
+        }
+      },
+      changecontract1(e) {
+        if (this.dataList1.taskTypeKey != 3) {
+          for (let i = 0; i < this.contractNoList.length; i++) {
+            if (this.contractNoList[i].contractNo == e) {
+              getGoodsName({
+                  contractId: this.contractNoList[i].id,
+                  contractNo: this.contractNoList[i].contractNo,
+                })
+                .toPromise()
+                .then((response) => {
+                  this.$set(this.dataList1, 'goodsName', response.goodsName)
+                  this.$set(this.dataList1, 'goodsNameKey', response.goodsNameKey)
+                  this.$set(this.dataList1, 'grade', response.grade)
+                  this.$set(this.dataList1, 'gradeKey', response.gradeKey)
+                  this.$set(this.dataList1, 'waterContent', response.waterContent)
+                  this.$set(this.dataList1, 'bulkDensity', response.bulkDensity)
+                  this.$set(this.dataList1, 'weight', response.weight)
+                  this.$set(
+                    this.dataList1,
+                    'unitPrice',
+                    response.unitContractPrice
+                  )
+                })
+            }
+          }
+        }
+      },
+      selectstaff(e) {
+        for (var i = 0; i < this.staffList.length; i++) {
+          if (this.staffList[i].staffName == e) {
+            this.dataList.agentKey = this.staffList[i].staffId
+          }
+        }
+      },
+      selectstaff1(e) {
+        for (var i = 0; i < this.staffList.length; i++) {
+          if (this.staffList[i].staffName == e) {
+            this.dataList1.agentKey = this.staffList[i].staffId
+          }
+        }
+      },
+      requestadd(list, status) {
+        console.log(list)
+        list.compId = localStorage.getItem('ws-pf_compId')
+        list.publisher =
+          localStorage.getItem('ws-pf_roleName') +
+          localStorage.getItem('ws-pf_staffName')
+        warehousetask(list)
+          .toPromise()
+          .then((response) => {
+            woekflowhandle({
+                taskId: list.taskId,
+                approved: true,
+                auditMind: '34',
+                needReapply: false,
+              })
               .toPromise()
               .then((response) => {
-                this.$set(this.dataList, 'goodsName', response.goodsName)
-                this.$set(this.dataList, 'goodsNameKey', response.goodsNameKey)
-                this.$set(this.dataList, 'grade', response.grade)
-                this.$set(this.dataList, 'gradeKey', response.gradeKey)
-                this.$set(this.dataList, 'waterContent', response.waterContent)
-                this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
-                // this.$set(this.dataList, 'weight', response.weight)
-                this.$set(
-                  this.dataList,
-                  'unitPrice',
-                  response.unitContractPrice
-                )
+                //   workflowcontent({workflowId:list.workflowId,businessKey:list.id}).toPromise()
+                // .then((response1) => {
+                //   console.log(response1)
+
+                workflowcontent({
+                    workflowId: item.workflowId,
+                    businessKey: item.id,
+                    type: '出入库任务'
+                  }).toPromise()
+                  .then((response1) => {
+                    this.$message.success('审核成功')
+                    this.$router.push({
+                      path: 'tranManagementWarehouseInOuttask'
+                    })
+                  })
+
+                // })
+              })
+          })
+      },
+      requestaudit(list, status) {
+        list.compId = localStorage.getItem('ws-pf_compId')
+        list.publisher =
+          localStorage.getItem('ws-pf_roleName') +
+          localStorage.getItem('ws-pf_staffName')
+        warehousetask(list)
+          .toPromise()
+          .then((response) => {
+            woekflowhandle({
+                taskId: list.taskId,
+                approved: false,
+                auditMind: this.auditMind,
+                needReapply: true,
               })
-          }
-        }
-      }
-    },
-    changecontract1(e) {
-      if (this.dataList1.taskTypeKey != 3) {
-        for (let i = 0; i < this.contractNoList.length; i++) {
-          if (this.contractNoList[i].contractNo == e) {
-            getGoodsName({
-              contractId: this.contractNoList[i].id,
-              contractNo: this.contractNoList[i].contractNo,
-            })
               .toPromise()
               .then((response) => {
-                this.$set(this.dataList1, 'goodsName', response.goodsName)
-                this.$set(this.dataList1, 'goodsNameKey', response.goodsNameKey)
-                this.$set(this.dataList1, 'grade', response.grade)
-                this.$set(this.dataList1, 'gradeKey', response.gradeKey)
-                this.$set(this.dataList1, 'waterContent', response.waterContent)
-                this.$set(this.dataList1, 'bulkDensity', response.bulkDensity)
-                this.$set(this.dataList1, 'weight', response.weight)
-                this.$set(
-                  this.dataList1,
-                  'unitPrice',
-                  response.unitContractPrice
-                )
+                workflowcontent({
+                    workflowId: item.workflowId,
+                    businessKey: item.id,
+                    type: '出入库任务'
+                  }).toPromise()
+                  .then((response1) => {
+                    this.$message.success('驳回成功')
+                    this.$router.push({
+                      path: 'tranManagementWarehouseInOuttask'
+                    })
+                  })
+
               })
+          })
+      },
+      //提交按钮
+      submit() {
+        this.dataList.inOutFlag = 1
+        this.dataList1.inOutFlag = 2
+        if (this.dataList.taskTypeKey == 1) {
+          this.requestadd(this.dataList)
+        } else if (this.dataList1.taskTypeKey == 2) {
+          this.requestadd(this.dataList1)
+        } else if (
+          this.dataList.taskTypeKey == 3 ||
+          this.dataList.taskTypeKey == 4
+        ) {
+          this.requestadd(this.dataList, 'repetition')
+          if (!this.deletetask) {
+            this.requestadd(this.dataList1, 'repetition')
           }
         }
-      }
-    },
-    selectstaff(e) {
-      for (var i = 0; i < this.staffList.length; i++) {
-        if (this.staffList[i].staffName == e) {
-          this.dataList.agentKey = this.staffList[i].staffId
+      },
+      disableReasons() {
+        this.dataList.inOutFlag = 1
+        this.dataList1.inOutFlag = 2
+        if (!this.auditMind) {
+          this.$message({
+            message: '驳回原因不能为空!',
+            type: 'warning',
+          })
+          return
         }
-      }
-    },
-    selectstaff1(e) {
-      for (var i = 0; i < this.staffList.length; i++) {
-        if (this.staffList[i].staffName == e) {
-          this.dataList1.agentKey = this.staffList[i].staffId
+        if (this.dataList.taskTypeKey == 1) {
+          this.requestaudit(this.dataList)
+        } else if (this.dataList1.taskTypeKey == 2) {
+          this.requestaudit(this.dataList1)
+        } else if (
+          this.dataList.taskTypeKey == 3 ||
+          this.dataList.taskTypeKey == 4
+        ) {
+          this.requestaudit(this.dataList, 'repetition')
+          if (!this.deletetask) {
+            this.requestaudit(this.dataList1, 'repetition')
+          }
         }
-      }
-    },
-    requestadd(list, status) {
-      console.log(list)
-      list.compId = localStorage.getItem('ws-pf_compId')
-      list.publisher =
-        localStorage.getItem('ws-pf_roleName') +
-        localStorage.getItem('ws-pf_staffName')
-      warehousetask(list)
-        .toPromise()
-        .then((response) => {
-          woekflowhandle({
-            taskId: list.taskId,
-            approved: true,
-            auditMind: '34',
-            needReapply: false,
-          })
-            .toPromise()
-            .then((response) => {
-            //   workflowcontent({workflowId:list.workflowId,businessKey:list.id}).toPromise()
-            // .then((response1) => {
-            //   console.log(response1)
-            workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'出入库任务'}).toPromise()
-            .then((response1) => {
-               this.$message.success('审核成功')
-              this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
-            })
-            
-            // })
-          })
-        })
-    },
-    requestaudit(list, status) {
-      list.compId = localStorage.getItem('ws-pf_compId')
-      list.publisher =
-        localStorage.getItem('ws-pf_roleName') +
-        localStorage.getItem('ws-pf_staffName')
-      warehousetask(list)
-        .toPromise()
-        .then((response) => {
-          woekflowhandle({
-            taskId: list.taskId,
-            approved: false,
-            auditMind: this.auditMind,
-            needReapply: true,
-          })
-            .toPromise()
-            .then((response) => {
-               workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'出入库任务'}).toPromise()
-            .then((response1) => {
-              this.$message.success('驳回成功')
-              this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
-            })
-              
-            })
-        })
-    },
-    //提交按钮
-    submit() {
-      this.dataList.inOutFlag = 1
-      this.dataList1.inOutFlag = 2
-      if (this.dataList.taskTypeKey == 1) {
-        this.requestadd(this.dataList)
-      } else if (this.dataList1.taskTypeKey == 2) {
-        this.requestadd(this.dataList1)
-      } else if (
-        this.dataList.taskTypeKey == 3 ||
-        this.dataList.taskTypeKey == 4
-      ) {
-        this.requestadd(this.dataList, 'repetition')
-        if (!this.deletetask) {
-          this.requestadd(this.dataList1, 'repetition')
+      },
+      selectwarehouseName() {},
+      tarechange(e) {
+        if (this.dataList.grossWeight && this.dataList.tare) {
+          this.dataList.netWeight = Number(
+            this.dataList.grossWeight - this.dataList.tare
+          )
         }
-      }
-    },
-    disableReasons() {
-      this.dataList.inOutFlag = 1
-      this.dataList1.inOutFlag = 2
-      if (!this.auditMind) {
-        this.$message({
-          message: '驳回原因不能为空!',
-          type: 'warning',
-        })
-        return
-      }
-      if (this.dataList.taskTypeKey == 1) {
-        this.requestaudit(this.dataList)
-      } else if (this.dataList1.taskTypeKey == 2) {
-        this.requestaudit(this.dataList1)
-      } else if (
-        this.dataList.taskTypeKey == 3 ||
-        this.dataList.taskTypeKey == 4
-      ) {
-        this.requestaudit(this.dataList, 'repetition')
-        if (!this.deletetask) {
-          this.requestaudit(this.dataList1, 'repetition')
+      },
+      grossWeightchange(e) {
+        if (this.dataList.grossWeight && this.dataList.tare) {
+          this.dataList.netWeight = Number(
+            this.dataList.grossWeight - this.dataList.tare
+          )
         }
-      }
-    },
-    selectwarehouseName() {},
-    tarechange(e) {
-      if (this.dataList.grossWeight && this.dataList.tare) {
-        this.dataList.netWeight = Number(
-          this.dataList.grossWeight - this.dataList.tare
-        )
-      }
-    },
-    grossWeightchange(e) {
-      if (this.dataList.grossWeight && this.dataList.tare) {
-        this.dataList.netWeight = Number(
-          this.dataList.grossWeight - this.dataList.tare
-        )
-      }
-    },
-    selectgoodsName(e) {
-      for (var i = 0; i < this.goodnameList.length; i++) {
-        if (this.goodnameList[i].constValue == e) {
-          this.dataList.goodsNameKey = this.goodnameList[i].constKey
+      },
+      selectgoodsName(e) {
+        for (var i = 0; i < this.goodnameList.length; i++) {
+          if (this.goodnameList[i].constValue == e) {
+            this.dataList.goodsNameKey = this.goodnameList[i].constKey
+          }
         }
-      }
-    },
-    selectgoodsName1(e) {
-      for (var i = 0; i < this.goodnameList.length; i++) {
-        if (this.goodnameList[i].constValue == e) {
-          this.dataList1.goodsNameKey = this.goodnameList[i].constKey
+      },
+      selectgoodsName1(e) {
+        for (var i = 0; i < this.goodnameList.length; i++) {
+          if (this.goodnameList[i].constValue == e) {
+            this.dataList1.goodsNameKey = this.goodnameList[i].constKey
+          }
         }
-      }
-    },
-    selectpackingMethod(e) {
-      for (var i = 0; i < this.gradeList.length; i++) {
-        if (this.gradeList[i].constValue == e) {
-          this.dataList.gradeKey = this.gradeList[i].constKey
-          if (this.dataList.taskTypeKey == 3) {
-            this.$set(this.dataList1, 'grade', e)
-            this.$set(this.dataList1, 'gradeKey', this.gradeList[i].constKey)
+      },
+      selectpackingMethod(e) {
+        for (var i = 0; i < this.gradeList.length; i++) {
+          if (this.gradeList[i].constValue == e) {
+            this.dataList.gradeKey = this.gradeList[i].constKey
+            if (this.dataList.taskTypeKey == 3) {
+              this.$set(this.dataList1, 'grade', e)
+              this.$set(this.dataList1, 'gradeKey', this.gradeList[i].constKey)
+            }
           }
         }
-      }
-    },
-    selectpackingMethod1(e) {
-      for (var i = 0; i < this.gradeList.length; i++) {
-        if (this.gradeList[i].constValue == e) {
-          this.dataList1.packingMethodKey = this.gradeList[i].constKey
-          if (this.dataList1.taskTypeKey == 4) {
-            this.$set(this.dataList, 'grade', e)
-            this.$set(this.dataList, 'gradeKey', this.gradeList[i].constKey)
+      },
+      selectpackingMethod1(e) {
+        for (var i = 0; i < this.gradeList.length; i++) {
+          if (this.gradeList[i].constValue == e) {
+            this.dataList1.packingMethodKey = this.gradeList[i].constKey
+            if (this.dataList1.taskTypeKey == 4) {
+              this.$set(this.dataList, 'grade', e)
+              this.$set(this.dataList, 'gradeKey', this.gradeList[i].constKey)
+            }
           }
         }
-      }
-    },
-    selectstorageType(e) {
-      for (var i = 0; i < this.storageType.length; i++) {
-        if (this.storageType[i].constValue == e) {
-          this.dataList.inOutTypeKey = this.storageType[i].constKey
+      },
+      selectstorageType(e) {
+        for (var i = 0; i < this.storageType.length; i++) {
+          if (this.storageType[i].constValue == e) {
+            this.dataList.inOutTypeKey = this.storageType[i].constKey
+          }
         }
-      }
-    },
-    selectstorageType1(e) {
-      for (var i = 0; i < this.storageType1.length; i++) {
-        if (this.storageType1[i].constValue == e) {
-          this.dataList1.inOutTypeKey = this.storageType1[i].constKey
+      },
+      selectstorageType1(e) {
+        for (var i = 0; i < this.storageType1.length; i++) {
+          if (this.storageType1[i].constValue == e) {
+            this.dataList1.inOutTypeKey = this.storageType1[i].constKey
+          }
         }
-      }
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    businessDescriptionchange(e) {
-      console.log(e)
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    tasknumber() {
-      if (this.dataList.taskTypeKey == 1) {
-        this.inOutTaskNo = 'CK' + this.getdate() + this.MathRand()
-      } else if (this.dataList.taskTypeKey == 2) {
-        this.inOutTaskNo1 = 'RK' + this.getdate() + this.MathRand()
-      } else if (this.dataList.taskTypeKey == 3) {
-        var random = this.getdate() + this.MathRand()
-        this.inOutTaskNo = 'YKC' + random
-        this.inOutTaskNo1 = 'YKR' + random
-      } else if (this.dataList.taskTypeKey == 4) {
-        var random = this.getdate() + this.MathRand()
-        this.inOutTaskNo = 'TCC' + random
-        this.inOutTaskNo1 = 'TCR' + random
-      }
-    },
-    tasktypechange(e) {
-      if (!this.$route.query.relevanceId) {
-        this.tasknumber()
-      }
-      this.dataList1.taskTypeKey = e
-      if (this.dataList.taskTypeKey == 1) {
-        this.dataList.inOutType = '销售出库'
-        this.dataList.inOutTypeKey = '1'
-      }
-      if (this.dataList1.taskTypeKey == 2) {
-        this.dataList1.inOutType = '采购入库'
-        this.dataList1.inOutTypeKey = '1'
-      } else if (this.dataList1.taskTypeKey == 3) {
-        this.disabled = true
-        this.dataList1.inOutType = '移库入库'
-        this.dataList1.inOutTypeKey = '3'
-        this.dataList.inOutType = '移库出库'
-        this.dataList.inOutTypeKey = '3'
-      } else if (this.dataList1.taskTypeKey == 4) {
-        this.disabled = true
-        this.dataList1.inOutType = '退库'
-        this.dataList1.inOutTypeKey = '6'
-        this.dataList.inOutType = '销售出库'
-        this.dataList.inOutTypeKey = '1'
-      }
-    },
-    GetRandomNum(Min, Max) {
-      var Range = Max - Min
-      var Rand = Math.random()
-      return Min + Math.round(Rand * Range)
-    },
-    getList() {
-      gettaskhistories({
-        businessKey: this.$route.query.businessKey,
-        workflowId: this.$route.query.workflowId,
-      })
-        .toPromise()
-        .then((response) => {
-          this.taskhistories = response
-        })
-
-      if (this.$route.query.relevanceId) {
-        outexamine({ relevanceId: this.$route.query.relevanceId })
+      },
+      handleClose() {
+        this.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      businessDescriptionchange(e) {
+        console.log(e)
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      tasknumber() {
+        if (this.dataList.taskTypeKey == 1) {
+          this.inOutTaskNo = 'CK' + this.getdate() + this.MathRand()
+        } else if (this.dataList.taskTypeKey == 2) {
+          this.inOutTaskNo1 = 'RK' + this.getdate() + this.MathRand()
+        } else if (this.dataList.taskTypeKey == 3) {
+          var random = this.getdate() + this.MathRand()
+          this.inOutTaskNo = 'YKC' + random
+          this.inOutTaskNo1 = 'YKR' + random
+        } else if (this.dataList.taskTypeKey == 4) {
+          var random = this.getdate() + this.MathRand()
+          this.inOutTaskNo = 'TCC' + random
+          this.inOutTaskNo1 = 'TCR' + random
+        }
+      },
+      tasktypechange(e) {
+        if (!this.$route.query.relevanceId) {
+          this.tasknumber()
+        }
+        this.dataList1.taskTypeKey = e
+        if (this.dataList.taskTypeKey == 1) {
+          this.dataList.inOutType = '销售出库'
+          this.dataList.inOutTypeKey = '1'
+        }
+        if (this.dataList1.taskTypeKey == 2) {
+          this.dataList1.inOutType = '采购入库'
+          this.dataList1.inOutTypeKey = '1'
+        } else if (this.dataList1.taskTypeKey == 3) {
+          this.disabled = true
+          this.dataList1.inOutType = '移库入库'
+          this.dataList1.inOutTypeKey = '3'
+          this.dataList.inOutType = '移库出库'
+          this.dataList.inOutTypeKey = '3'
+        } else if (this.dataList1.taskTypeKey == 4) {
+          this.disabled = true
+          this.dataList1.inOutType = '退库'
+          this.dataList1.inOutTypeKey = '6'
+          this.dataList.inOutType = '销售出库'
+          this.dataList.inOutTypeKey = '1'
+        }
+      },
+      GetRandomNum(Min, Max) {
+        var Range = Max - Min
+        var Rand = Math.random()
+        return Min + Math.round(Rand * Range)
+      },
+      getList() {
+        gettaskhistories({
+            businessKey: this.$route.query.businessKey,
+            workflowId: this.$route.query.workflowId,
+          })
           .toPromise()
           .then((response) => {
-            if (response.length > 1) {
-              if (response[0].taskTypeKey == 3) {
-                if (response[0].inOutType == '移库出库') {
-                  this.dataList = response[0]
-                  this.dataList1 = response[1]
-                } else {
-                  this.dataList = response[1]
+            this.taskhistories = response
+          })
+
+        if (this.$route.query.relevanceId) {
+          outexamine({
+              relevanceId: this.$route.query.relevanceId
+            })
+            .toPromise()
+            .then((response) => {
+              if (response.length > 1) {
+                if (response[0].taskTypeKey == 3) {
+                  if (response[0].inOutType == '移库出库') {
+                    this.dataList = response[0]
+                    this.dataList1 = response[1]
+                  } else {
+                    this.dataList = response[1]
+                    this.dataList1 = response[0]
+                  }
+                }
+              } else {
+                if (response[0].taskTypeKey == 3) {
+                  this.deletetask = true
+                  this.dataList1.inOutTaskNo =
+                    'YKR' +
+                    response[0].inOutTaskNo.substr(
+                      response[0].inOutTaskNo.indexOf('C') + 1,
+                      response[0].inOutTaskNo.length
+                    )
+                } else if (response[0].taskTypeKey == 2) {
                   this.dataList1 = response[0]
                 }
+                this.dataList = response[0]
               }
-            } else {
-              if (response[0].taskTypeKey == 3) {
-                this.deletetask = true
-                this.dataList1.inOutTaskNo =
-                  'YKR' +
-                  response[0].inOutTaskNo.substr(
-                    response[0].inOutTaskNo.indexOf('C') + 1,
-                    response[0].inOutTaskNo.length
-                  )
-              } else if (response[0].taskTypeKey == 2) {
-                this.dataList1 = response[0]
+            })
+        } else {
+          this.tasknumber()
+          this.$set(this.dataList, 'inOutType', '销售出库')
+          this.$set(this.dataList, 'inOutTypeKey', '1')
+          this.$set(this.dataList, 'goodsName', '玉米')
+          this.$set(this.dataList, 'goodsNameKey', '1')
+          this.$set(this.dataList, 'grade', '一等品')
+          this.$set(this.dataList, 'gradeKey', '1')
+          this.$set(this.dataList1, 'goodsName', '玉米')
+          this.$set(this.dataList1, 'goodsNameKey', '1')
+          this.$set(this.dataList1, 'grade', '一等品')
+          this.$set(this.dataList1, 'gradeKey', '1')
+        }
+
+        // 货名
+        pullDown({
+            constId: 'CON2'
+          })
+          .toPromise()
+          .then((response) => {
+            this.goodnameList = response
+          })
+        // 品级
+        pullDown({
+            constId: 'CON3'
+          })
+          .toPromise()
+          .then((response) => {
+            this.gradeList = response
+          })
+        pullDown({
+            constId: 'CON6'
+          })
+          .toPromise()
+          .then((response) => {
+            this.storageType = response
+          })
+        pullDown({
+            constId: 'CON5'
+          })
+          .toPromise()
+          .then((response) => {
+            this.storageType1 = response
+          })
+        xialaNo({
+            compId: this.compId,
+          })
+          .toPromise()
+          .then((response) => {
+            this.contractNoList = response
+            for (let i = 0; i < this.contractNoList.length; i++) {
+              if (this.contractNoList[i].contractNo == this.dataList.contractNo) {
+                if (this.contractNoList[i].priceType == "随行就市") {
+                  this.Pricetype = false
+                } else {
+                  this.Pricetype = true
+                }
               }
-              this.dataList = response[0]
             }
           })
-      } else {
-        this.tasknumber()
-        this.$set(this.dataList, 'inOutType', '销售出库')
-        this.$set(this.dataList, 'inOutTypeKey', '1')
-        this.$set(this.dataList, 'goodsName', '玉米')
-        this.$set(this.dataList, 'goodsNameKey', '1')
-        this.$set(this.dataList, 'grade', '一等品')
-        this.$set(this.dataList, 'gradeKey', '1')
-        this.$set(this.dataList1, 'goodsName', '玉米')
-        this.$set(this.dataList1, 'goodsNameKey', '1')
-        this.$set(this.dataList1, 'grade', '一等品')
-        this.$set(this.dataList1, 'gradeKey', '1')
-      }
-
-      // 货名
-      pullDown({ constId: 'CON2' })
-        .toPromise()
-        .then((response) => {
-          this.goodnameList = response
-        })
-      // 品级
-      pullDown({ constId: 'CON3' })
-        .toPromise()
-        .then((response) => {
-          this.gradeList = response
-        })
-      pullDown({ constId: 'CON6' })
-        .toPromise()
-        .then((response) => {
-          this.storageType = response
-        })
-      pullDown({ constId: 'CON5' })
-        .toPromise()
-        .then((response) => {
-          this.storageType1 = response
-        })
-      xialaNo({
-        compId: this.compId,
-      })
-        .toPromise()
-        .then((response) => {
-          this.contractNoList = response
-          for (let i = 0; i <  this.contractNoList.length; i++) {
-              if ( this.contractNoList[i].contractNo == this.dataList.contractNo) {
-                  if( this.contractNoList[i].priceType == "随行就市"){
-                    this.Pricetype = false
-                  }else{
-                    this.Pricetype = true
-                  }
+        //仓库名
+        getwarehousename({
+            compId: this.compId,
+            warehouseType: 1,
+          })
+          .toPromise()
+          .then((response) => {
+            this.warehouseNameList = response
+            for (let i = 0; i < this.warehouseNameList.length; i++) {
+              if (
+                this.dataList.warehouseName ==
+                this.warehouseNameList[i].warehouseName
+              ) {
+                this.binNumberList1 = this.warehouseNameList[i].positionInfos
+              }
+              if (
+                this.dataList1.warehouseName ==
+                this.warehouseNameList[i].warehouseName
+              ) {
+                this.binNumberList = this.warehouseNameList[i].positionInfos
               }
             }
-        })
-      //仓库名
-      getwarehousename({
-        compId: this.compId,
-        warehouseType: 1,
-      })
-        .toPromise()
-        .then((response) => {
-          this.warehouseNameList = response
-          for (let i = 0; i < this.warehouseNameList.length; i++) {
-            if (
-              this.dataList.warehouseName ==
-              this.warehouseNameList[i].warehouseName
-            ) {
-              this.binNumberList1 = this.warehouseNameList[i].positionInfos
-            }
-            if (
-              this.dataList1.warehouseName ==
-              this.warehouseNameList[i].warehouseName
-            ) {
-              this.binNumberList = this.warehouseNameList[i].positionInfos
-            }
+          })
+        getwarehousename({
+            compId: this.compId,
+            warehouseType: 2,
+          })
+          .toPromise()
+          .then((response) => {
+            this.warehouseNameList1 = response
+          })
+        //经办人
+        getstaff({
+            compId: localStorage.getItem('ws-pf_compId')
+          })
+          .toPromise()
+          .then((response) => {
+            this.options = response
+            this.staffList = response
+            //  this.agent = response
+          })
+      },
+      selecttaskType(e) {
+        for (var i = 0; i < this.taskTypeList.length; i++) {
+          if (this.taskTypeList[i].value == e) {
+            this.searchType = this.taskTypeList[i].type
           }
-        })
-      getwarehousename({
-        compId: this.compId,
-        warehouseType: 2,
-      })
-        .toPromise()
-        .then((response) => {
-          this.warehouseNameList1 = response
-        })
-      //经办人
-      getstaff({ compId: localStorage.getItem('ws-pf_compId') })
-        .toPromise()
-        .then((response) => {
-          this.options = response
-          this.staffList = response
-          //  this.agent = response
-        })
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
         }
-      }
-    },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      console.log(row)
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
+      },
+      fujian(row) {
+        if (
+          row.receiveAttachmentPath === null ||
+          row.receiveAttachmentPath === ''
+        ) {
+          EventBus.$emit(
+            'warning',
+            this.$t('system.noticeCircular.NoInformation')
+          )
+        } else {
+          this.accessoryTFs = true
+        }
+        this.appendixIdss = row.receiveAttachmentPath
+      },
+      handleExamine(row) {
+        this.$router.push({
+          name: 'salesContractExamine',
+          query: {
+            id: row.id
+          },
         })
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
+      history(row) {
+        console.log(row)
+        billoperatehis({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-/deep/.basicInformation {
-  .el-info-table {
-    border: none;
+  /deep/.basicInformation {
+    .el-info-table {
+      border: none;
+      position: relative;
+    }
+
+    .el-form-item {
+      width: 33.3333%;
+      border: none;
+      margin: 0;
+
+      .el-form-item__label {
+        text-align: left;
+        font-size: 14px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #8890b1;
+      }
+
+      .el-form-item__content {
+        padding-left: 0px;
+        padding-right: 10px;
+        // background: #fff;
+        white-space: nowrap;
+        height: 40px;
+        display: flex;
+        -webkit-box-align: center;
+        align-items: center;
+        text-align: left;
+        overflow: hidden;
+      }
+    }
+  }
+
+  /deep/.el-radio {
+    color: #606266;
+    font-weight: 500;
+    line-height: 1;
+    cursor: pointer;
+    white-space: nowrap;
+    outline: 0;
+    margin-right: 30px;
+    margin-top: 15px;
+  }
+
+  /deep/.el-radio__inner {
+    border: 1px solid #dcdfe6;
+    border-radius: 100%;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    cursor: pointer;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    margin-left: 100px;
+  }
+
+  /deep/.el-radio__input {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: 0;
+    line-height: 1;
+    vertical-align: middle;
+    margin-top: -1px;
+  }
+
+  .title {
     position: relative;
+    padding-left: 10px;
+  }
+
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+
+  .el-form {
+    padding: 0 15%;
+    display: flex;
+    flex-wrap: wrap;
+    margin-left: -50px;
+    margin-top: 15px;
+    width: 110%;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-col {
+    background: #f6f7fc;
   }
-  .el-form-item {
-    width: 33.3333%;
+
+  .bg-right {
+    text-align: right;
+    padding: 16px 20px;
+  }
+
+  .center {
+    height: 100px;
+    margin: 10px auto;
+    margin-right: 180px;
+  }
+
+  /deep/.el-form-item__label {
+    width: 160px;
+  }
+
+  .inspector {
+    width: 50%;
+  }
+
+  /deep/.el-form-item--small .el-form-item__label,
+  .el-form-item--small .el-form-item__content {
+    text-align: left;
+  }
+
+  /deep/.el-input--small {
+    font-size: 13px;
+    position: relative;
+    display: inline-block;
+  }
+
+  .center1 .small-title {
+    margin-left: 323px;
+  }
+
+  .center1 {
+    width: 90%;
+    margin: 0 auto;
+    margin-left: 10px;
+    margin-top: 25px;
+  }
+
+  /deep/.el-input--small .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+  }
+
+  /deep/.el-select {
+    display: inline-block;
+    position: relative;
+    width: 100%;
+  }
+
+  .annu {
+    height: 81px;
+    background: #ffffff;
+    border-radius: 4px;
+  }
+
+  .basicInformation .el-form-item {
+    width: 50.3333%;
     border: none;
     margin: 0;
-    .el-form-item__label {
-      text-align: left;
-      font-size: 14px;
-      font-family: PingFangSC-Regular, PingFang SC;
-      font-weight: 400;
-      color: #8890b1;
-    }
-    .el-form-item__content {
-      padding-left: 0px;
-      padding-right: 10px;
-      // background: #fff;
-      white-space: nowrap;
-      height: 40px;
-      display: flex;
-      -webkit-box-align: center;
-      align-items: center;
-      text-align: left;
-      overflow: hidden;
-    }
   }
-}
-/deep/.el-radio {
-  color: #606266;
-  font-weight: 500;
-  line-height: 1;
-  cursor: pointer;
-  white-space: nowrap;
-  outline: 0;
-  margin-right: 30px;
-  margin-top: 15px;
-}
-/deep/.el-radio__inner {
-  border: 1px solid #dcdfe6;
-  border-radius: 100%;
-  width: 14px;
-  height: 14px;
-  background-color: #fff;
-  cursor: pointer;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  margin-left: 100px;
-}
-/deep/.el-radio__input {
-  white-space: nowrap;
-  cursor: pointer;
-  outline: 0;
-  line-height: 1;
-  vertical-align: middle;
-  margin-top: -1px;
-}
-.title {
-  position: relative;
-  padding-left: 10px;
-}
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
-  position: absolute;
-  left: 0;
-}
-.el-form {
-  padding: 0 15%;
-  display: flex;
-  flex-wrap: wrap;
-  margin-left: -50px;
-  margin-top: 15px;
-  width: 110%;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-col {
-  background: #f6f7fc;
-}
-.bg-right {
-  text-align: right;
-  padding: 16px 20px;
-}
-.center {
-  height: 100px;
-  margin: 10px auto;
-  margin-right: 180px;
-}
-/deep/.el-form-item__label {
-  width: 160px;
-}
-.inspector {
-  width: 50%;
-}
-/deep/.el-form-item--small .el-form-item__label,
-.el-form-item--small .el-form-item__content {
-  text-align: left;
-}
-/deep/.el-input--small {
-  font-size: 13px;
-  position: relative;
-  display: inline-block;
-}
-.center1 .small-title {
-  margin-left: 323px;
-}
-.center1 {
-  width: 90%;
-  margin: 0 auto;
-  margin-left: 10px;
-  margin-top: 25px;
-}
-/deep/.el-input--small .el-input__inner {
-  height: 32px;
-  line-height: 32px;
-}
-/deep/.el-select {
-  display: inline-block;
-  position: relative;
-  width: 100%;
-}
-.annu {
-  height: 81px;
-  background: #ffffff;
-  border-radius: 4px;
-}
-.basicInformation .el-form-item {
-  width: 50.3333%;
-  border: none;
-  margin: 0;
-}
-.huom {
-  width: 100%;
-}
-.el-form {
-  font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-  margin-left: 130px;
-}
-.a {
-  margin-left: -32px;
-}
-.el-radio-group {
-  margin-left: 80px;
-}
-.ding {
-  height: 23px;
-  background: #e8ecf6;
-  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
-}
-.ziti {
-  width: 72px;
-  height: 20px;
-  font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 20px;
-  margin-left: 310px;
-  /* margin-top: 112px; */
-}
-.ziti1 {
-  width: 100px;
-  font-size: 16px;
-  font-family: PingFangSC-Medium, PingFang SC;
-  font-weight: 500;
-  color: #262626;
-  line-height: 22px;
-  margin-left: 381px;
-  margin-top: -21px;
-}
-.winseaview-view {
-  padding: 0 0 20px;
-}
-.container {
-  overflow: scroll;
-  height: 93vh;
-}
-.nav {
-  width: 381px;
-  height: 20px;
-}
-.wenzi {
-  margin: 0 auto;
-}
+
+  .huom {
+    width: 100%;
+  }
+
+  .el-form {
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
+    margin-left: 130px;
+  }
+
+  .a {
+    margin-left: -32px;
+  }
+
+  .el-radio-group {
+    margin-left: 80px;
+  }
+
+  .ding {
+    height: 23px;
+    background: #e8ecf6;
+    box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+  }
+
+  .ziti {
+    width: 72px;
+    height: 20px;
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 20px;
+    margin-left: 310px;
+    /* margin-top: 112px; */
+  }
+
+  .ziti1 {
+    width: 100px;
+    font-size: 16px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #262626;
+    line-height: 22px;
+    margin-left: 381px;
+    margin-top: -21px;
+  }
+
+  .winseaview-view {
+    padding: 0 0 20px;
+  }
+
+  .container {
+    overflow: scroll;
+    height: 93vh;
+  }
+
+  .nav {
+    width: 381px;
+    height: 20px;
+  }
+
+  .wenzi {
+    margin: 0 auto;
+  }
 </style>

+ 76 - 2
src/views/warehouse/warehouseManagementNoWeight.vue

@@ -85,6 +85,11 @@
           " class="putstorage" @click="edits(scope.row)">
                   毛检
                 </ws-button>
+              <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.huan`
+          " class="putstorage" @click="exchange(scope.row)">
+                  换仓
+                </ws-button>
                 <!-- <el-button @click="print(scope.row)"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button > -->
 
                 <!-- <div class="record" @click="edits(scope.row)">编辑</div>
@@ -100,7 +105,21 @@
               :total="deptBudgetTotal">
             </el-pagination>
           </div>
-
+          <el-dialog
+          title="提示"
+          :visible.sync="dialogVisible"
+          width="30%"
+          :before-close="handleClose">
+          <el-select filterable clearable v-model="binNumber" placeholder="请选择仓位" class="typeselect"
+              @change="binNumberChange">
+              <el-option v-for="item in binnumberList" :key="item.binNumber" :label="item.binNumber"
+                :value="item.binNumber" />
+            </el-select>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisibleconfirm">确 定</el-button>
+          </span>
+        </el-dialog>
         </div>
       </ws-form>
 
@@ -112,6 +131,8 @@
     delInOut,
     completeList,
     getPrintInfo,
+    getbinnumber,
+    addstorageputList
     // deletewarehouse,
     // warehouseName,
     // addstorageputList,
@@ -147,6 +168,7 @@
         tableDate: [],
         // 是否显示
         showType: true,
+        binNumber:'', 
         // 年
         year: '',
         deptBudgetTotal: 0,
@@ -158,12 +180,15 @@
         startDate: null,
         endDate: null,
         value2: [],
+        dialogVisible:false,
+        id:0,
         deletewarehouse: [],
         improved: [],
         row: [],
         deptBudgetList1: [],
         // 提交类型
         submitType: true,
+        binnumberList:[],
         selectpackingMethod: {},
         size: 10,
         compId: localStorage.getItem('ws-pf_compId'),
@@ -190,7 +215,7 @@
       //cg.viewSpareMoney
       // this.getVesselData();
       this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
-      this.binNumber = this.$route.params.binNumber
+      this.binNumber = this.$route.query.binNumber
       this.status = this.$route.query.status
       this.deptBudgetList.warehouseType = this.$route.query.warehouseType
       this.createType = this.$route.query.createType
@@ -204,6 +229,55 @@
       this.showType = this.isShow
     },
     methods: {
+      handleClose(){
+        this.dialogVisible=false
+      },
+      dialogVisibleconfirm(){
+        this.$confirm(`确定修改仓位?`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
+          .then(() => {
+              addstorageputList({statusFlag:1,id:this.id,positionId:this.deptBudgetList.positionId,binNumber:this.binNumber,warehouseInOutDetail:{}}).toPromise()
+						.then((response) => {
+              this.$notify.success({
+                  title: '成功',
+                  message: '修改仓位成功',
+                })
+                this.dialogVisible=false
+							this.getList(
+              this.$route.query.baseId,
+              this.$route.query.positionId,
+              this.$route.query.warehouseType
+            )
+              
+						})
+          })
+          .catch(() => {
+            return false
+          })
+        
+      },
+      binNumberChange(e){
+					for (let i = 0; i < this.binnumberList.length; i++) {
+						if(this.binnumberList[i].binNumber==e){
+							this.deptBudgetList.positionId=this.binnumberList[i].id
+						}
+					}
+			},
+       exchange(row){
+         var that=this
+         getbinnumber({id:  this.$route.query.baseId}).toPromise()
+						.then((response) => {
+							
+							this.binnumberList = response.warehousePositionInfoList
+              this.$forceUpdate()
+						})
+         this.id=row.id
+         this.dialogVisible=true
+
+       },
       datechange() {
         this.getList()
       },

+ 24 - 2
src/views/warehouse/warehouseManagementRecord.vue

@@ -180,11 +180,12 @@
 					</el-table-column>
 					<el-table-column prop="backOffice" label="操作人" width="120px">
 					</el-table-column>
-					<el-table-column prop="addressUrl" label="操作" width="100px">
+					<el-table-column prop="addressUrl" label="操作" width="200">
 						<template slot-scope="scope">
 							<!-- <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
 								src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" /> -->
           					<el-button @click="print(scope.row)" v-if="scope.row.inOutType != '收购入库'&&scope.row.inOutType != '期初'&& scope.row.inOutType != '折转入库'&& scope.row.inOutType != '折转出库'"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
+							<el-button @click="back(scope.row)"   v-hasPermission="`acquisitionManagement.acquisitionWeight.tui`">退回</el-button >
 						</template>
 					</el-table-column>
 					<el-table-column prop="createDate" label="录入时间">
@@ -314,7 +315,8 @@
 		addselectinfoList,
 		recordss,
 		getPrintInfo,
-		getbinnumber
+		getbinnumber,
+		sendback
 	} from '@/model/warehouse/index'
 	import {
 		downloadFile
@@ -411,6 +413,26 @@
 			})
 		},
 		methods: {
+			back(row){
+				this.$confirm(`确定退回该操作数据?`, {
+					cancelButtonText: '取消',
+					confirmButtonText: '确定',
+					type: 'warning',
+				})
+				.then(() => {
+					sendback({id:row.id}).toPromise()
+					.then((response) => {
+						this.$notify.success({
+							title: '成功',
+							message: '退回成功',
+						})
+						this.getList()
+					})
+				})
+				.catch(() => {
+					return false
+				})
+			},
 			batchPrint(){
 				if(this.modification.length == 0 ){
 					this.$message.error("请勾选要打印的条目!")

+ 16 - 19
src/views/warehouse/warehouseManagementTare.vue

@@ -323,6 +323,7 @@
     getstaff,
     goodsnameXiala,
     getReceiptTaskNo,
+    getPrintInfo
   } from '@/model/warehouse/index'
   import Pagination from '@/components/Pagination'
   import WsUpload from '@/components/WsUpload'
@@ -1451,6 +1452,8 @@
         }).then(() => {
           this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
+              console.log( this.deptBudgetList)
+
               this.deptBudgetList.grossWeight /= 1000
               this.deptBudgetList.tare /= 1000
               this.deptBudgetList.netWeight /= 1000
@@ -1470,25 +1473,19 @@
                   }
                   this.$message.success('添加成功')
                   if (status) {
-                    this.weightbills.carNo = this.deptBudgetList.carNo
-                    this.weightbills.boxNo = this.deptBudgetList.boxNo
-                    this.weightbills.boxNoOther = this.deptBudgetList.boxNoOther
-                    this.weightbills.wingNumber = this.deptBudgetList.wingNumber
-                    this.weightbills.wingNumberOther = this.deptBudgetList.wingNumberOther
-                    this.weightbills.shipName = this.deptBudgetList.shipName
-                    this.weightbills.shipNumber = this.deptBudgetList.shipNumber
-                    this.weightbills.type = this.deptBudgetList.type
-                    this.weightbills.grossWeight = this.deptBudgetList.grossWeight
-                    this.weightbills.tare = this.deptBudgetList.tare
-                    this.weightbills.netWeight = this.deptBudgetList.netWeight
-                    this.weightbills.outType = this.deptBudgetList.outType
-                    this.weightbills.backOffice = this.deptBudgetList.outType
-
-                    var date = new Date()
-                    this.weightbills.updateDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' +
-                      date.getDate() + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds()
-                      localStorage.setItem('ck_bd_printData1',JSON.stringify(this.weightbills))
-                      window.open('../../../../static/weightCheckOut.html?type=2')
+                     getPrintInfo({
+                            id: response,
+                          })
+                          .toPromise()
+                          .then((res) => {
+                            localStorage.setItem('ck_bd_printData',JSON.stringify(res))//出库皮重检斤
+                           window.open('../../../../static/weightCheckInOut.html?type=2')
+                          })
+                    // var date = new Date()
+                    // this.weightbills.updateDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' +
+                    //   date.getDate() + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds()
+                    //   localStorage.setItem('ck_bd_printData',JSON.stringify(this.deptBudgetList))//出库皮重检斤
+                    //   window.open('../../../../static/weightCheckInOut.html?type=2')
                   }
                   this.$router.push({
                     path: 'warehouseManagementList',