浏览代码

凯合订单修改

wengyuwen 4 年之前
父节点
当前提交
c9c347984c

+ 17 - 0
src/api/kaihe/domesticTrade/orderInformation.js

@@ -1,5 +1,6 @@
 // 查询航线详情列表
 import request from '@/utils/request'
+import { query } from '@/api/track/singleCost'
 
 export function listCorps(tCntrno) {
   return request({
@@ -97,3 +98,19 @@ export function getGoodName(data) {
     data: data
   })
 }
+//获取客户信息
+export function getFName(data) {
+  return request({
+    url: '/khwarehouse/warehousebills/getClientName',
+    method: 'post',
+    data: data
+  })
+}
+//获取审批人
+export function getApproval(data) {
+  return request({
+    url: 'warehouse/paths/projectEndQueryPendingVal',
+    method: 'post',
+    data: data
+  })
+}

+ 20 - 13
src/views/kaihe/domesticTrade/myOrder/index.vue

@@ -191,16 +191,15 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-hasPermi="['shipping:ctnprice:edit']"
             @click="handleUpdate(scope.row)"
+            v-hasPermi="['warehouse:warehousebills:webVersionOrderDetails']"
           >查看</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['shipping:items:remove']"
-            @click="handleDelete(scope.row)"
-          >移除</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--          >移除</el-button>-->
         </template>
       </el-table-column>
 
@@ -230,6 +229,7 @@
   import Cookies from 'js-cookie'
   import { addSet, resetModule, select } from '@/api/system/set'
   import Vue from 'vue'
+  import draggable from "vuedraggable";
   Vue.directive('dialogDrag', {
     bind(el, binding, vnode, oldVnode) {
       const dialogHeaderEl = el.querySelector('.el-dialog__header')
@@ -288,6 +288,7 @@
   export default {
     name: "myOrder",
     components: {
+      draggable,
     },
     data() {
       return {
@@ -457,7 +458,7 @@
           this.serviceitems = response.data;
         }
       });
-      // this.getRow()
+      this.getRow()
     },
     activated() {
       // this.getList()
@@ -494,7 +495,7 @@
       //重置列表
       delRow() {
         this.data = {
-          tableName: "船舶信息",
+          tableName: "我的订单",
           userId: Cookies.get("userName"),
         };
         resetModule(this.data).then((res) => {
@@ -521,7 +522,7 @@
       getRow() {
         let that = this;
         this.data = {
-          tableName: "船舶信息",
+          tableName: "我的订单",
           userId: Cookies.get("userName"),
         };
         select(this.data).then((res) => {
@@ -546,7 +547,7 @@
       save() {
         this.showSetting = false;
         this.data = {
-          tableName: "船舶信息",
+          tableName: "我的订单",
           userId: Cookies.get("userName"),
           sysTableSetList: this.setRowList,
         };
@@ -678,5 +679,11 @@
   background-color: rgba(0, 0, 0, 0.05);
   height: 100%;
 }
-
+</style>
+<style lang="scss">
+.el-table {
+  .el-table__body-wrapper {
+    z-index: 2;
+  }
+}
 </style>

+ 149 - 201
src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -5,6 +5,17 @@
         <el-form ref="form" v-model="form" label-width="130px" size="mini" class="selectForm">
           <el-row >
             <el-col :span="6" >
+              <el-form-item label="订舱单位" prop="corpName">
+                <el-input
+                  v-model="form.corpName"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6" >
               <el-form-item label="提单号" prop="fMblno">
                 <el-input
                   v-model="form.fMblno"
@@ -42,6 +53,7 @@
                   v-model="form.fBsdate"
                   type="date"
                   size="small"
+                  style="width: 100%"
                   :disabled="doNot"
                   placeholder="选择日期"
                   format="yyyy-MM-dd">
@@ -385,22 +397,22 @@
           <el-table-column label="序号" type="index" width="80"/>
           <el-table-column label="箱号" align="center" prop="fCntrno">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fCntrno" :disabled="scope.row.fManual == 0"/>
+              <el-input v-model="scope.row.fCntrno" :disabled="scope.row.fManual == 0 || modify"/>
             </template>
           </el-table-column>
           <el-table-column label="铅封号" align="center" prop="fSealno">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fSealno" :disabled="scope.row.fManual == 0"/>
+              <el-input v-model="scope.row.fSealno" :disabled="scope.row.fManual == 0 || modify"/>
             </template>
           </el-table-column>
           <el-table-column prop="fCntrweight" label="单箱重量(吨)" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fCntrweight" :disabled="scope.row.fManual == 0"/>
+              <el-input v-model="scope.row.fCntrweight" :disabled="scope.row.fManual == 0 || modify"/>
             </template>
           </el-table-column>
           <el-table-column prop="fGoodsid" label="货名" align="center">
             <template slot-scope="scope">
-              <el-select clearable v-model="scope.row.fGoodsid" :disabled="scope.row.fManual == 0">
+              <el-select clearable v-model="scope.row.fGoodsid" :disabled="scope.row.fManual == 0 || modify">
                 <el-option
                   v-for="item in goodsOptions"
                   :key="item.fId"
@@ -411,7 +423,7 @@
           </el-table-column>
           <el-table-column prop="fPackageid" label="包装类型" align="center">
             <template slot-scope="scope">
-              <el-select clearable v-model="scope.row.fPackageid" :disabled="scope.row.fManual == 0">
+              <el-select clearable v-model="scope.row.fPackageid" :disabled="scope.row.fManual == 0 || modify">
                 <el-option
                   v-for="dict in packgeOptions"
                   :key="dict.dictValue"
@@ -422,7 +434,7 @@
           </el-table-column>
           <el-table-column prop="fCntrid" label="箱型" align="center">
             <template slot-scope="scope">
-              <el-select clearable v-model="scope.row.fCntrid" :disabled="scope.row.fManual == 0">
+              <el-select clearable v-model="scope.row.fCntrid" :disabled="scope.row.fManual == 0 || modify">
                 <el-option
                 v-for="item in cntrOptions"
                 :key="item.fId"
@@ -441,7 +453,7 @@
 <!--          </el-table-column>-->
           <el-table-column prop="address" label="操作" align="center">
             <template slot-scope="scope">
-              <el-button size="small" :disabled="scope.row.fManual == 0" @click="deleteRow(scope.$index, dataList)">移除</el-button>
+              <el-button size="small" :disabled="scope.row.fManual == 0 || modify" @click="deleteRow(scope.$index, dataList)">移除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -508,23 +520,20 @@
                   label="客户名称"
                 >
                   <template slot-scope="scope">
-                    <el-input
+                    <el-select
                       v-model="scope.row.fCorpid"
-                      :disabled="modify || scope.row.fSrcTypeId != 0"/>
-<!--                    <el-select-->
-<!--                      v-model="scope.row.fCorpid"-->
-<!--                      filterable-->
-<!--                      remote-->
-<!--                      :disabled="modify"-->
-<!--                      placeholder="客户名称"-->
-<!--                    >-->
-<!--                      <el-option-->
-<!--                        v-for="(dict, index) in KHblnoOptions"-->
-<!--                        :key="index.fId"-->
-<!--                        :label="dict.fName"-->
-<!--                        :value="dict.fId"-->
-<!--                      ></el-option>-->
-<!--                    </el-select>-->
+                      filterable
+                      remote
+                      :disabled="modify || scope.row.fSrcTypeId != 0"
+                      placeholder="客户名称"
+                    >
+                      <el-option
+                        v-for="item in nameOptions"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                      ></el-option>
+                    </el-select>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -540,8 +549,6 @@
                       filterable
                       remote
                       :disabled="modify || scope.row.fSrcTypeId !== 0"
-                      :remote-method="fWRemoteMethod"
-                      @change="changeFeeId(scope.row)"
                       placeholder="费用名称"
                     >
                       <el-option
@@ -750,7 +757,7 @@
             </el-collapse-item>
       <el-collapse-item>
               <template slot="title">
-                <i class="el-icon-remove"></i>付款信息
+                <i class="el-icon-remove"></i>应付费用
               </template>
               <div
                 class="dialogTableTitle flex a-center jlr"
@@ -806,23 +813,20 @@
                   label="客户名称"
                 >
                   <template slot-scope="scope">
-                    <el-input
+                    <el-select
                       v-model="scope.row.fCorpid"
-                      :disabled="modify || scope.row.fSrcTypeId != 0"/>
-<!--                    <el-select-->
-<!--                      v-model="scope.row.fCorpid"-->
-<!--                      filterable-->
-<!--                      remote-->
-<!--                      :disabled="modify"-->
-<!--                      placeholder="客户名称"-->
-<!--                    >-->
-<!--                      <el-option-->
-<!--                        v-for="(dict, index) in KHblnoOptions"-->
-<!--                        :key="index.fId"-->
-<!--                        :label="dict.fName"-->
-<!--                        :value="dict.fId"-->
-<!--                      ></el-option>-->
-<!--                    </el-select>-->
+                      filterable
+                      remote
+                      :disabled="modify || scope.row.fSrcTypeId != 0"
+                      placeholder="客户名称"
+                    >
+                      <el-option
+                        v-for="item in nameOptions"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                      ></el-option>
+                    </el-select>
                   </template>
                 </el-table-column>
           <el-table-column
@@ -838,8 +842,6 @@
                 filterable
                 :disabled="modify || scope.row.fSrcTypeId !== 0"
                 remote
-                :remote-method="fWRemoteMethod"
-                @change="changeFeeId(scope.row)"
                 placeholder="费用名称"
               >
                 <el-option
@@ -865,7 +867,6 @@
                 remote
                 @change="changeFeeUnit(scope.row)"
                 :disabled="modify || scope.row.fSrcTypeId !== 0"
-                :remote-method="corpsRemoteMethod"
                 placeholder="计价单位"
               >
                 <el-option
@@ -1056,10 +1057,11 @@
     <div style="margin:60px;float: right">
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
       <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
-      <el-button type="info" @click="modifyInfo">修改</el-button>
-      <el-button type="success" @click="approval">保 存</el-button>
-      <el-button type="success" @click="addOrUpdateHand(form)">审批</el-button>
-      <el-button type="primary" v-if="form.fBillstatus > 3" @click="addOrUpdateHandle(form)">查看审批</el-button
+      <el-button type="info" v-if="this.form.fBillstatus == 11" @click="modify = false">修 改</el-button>
+      <el-button type="success" v-if="this.form.fBillstatus == 11" @click="approval">保 存</el-button>
+<!--      <el-button type="primary" v-if="this.form.fBillstatus == 11" @click="approval">请 核</el-button>-->
+      <el-button type="success" v-if="approVal" @click="addOrUpdateHand(form)">审 批</el-button>
+      <el-button type="primary" v-if="this.form.fBillstatus != 11"@click="addOrUpdateHandle(form)">查看审批</el-button
       >
     </div>
 <!--    附件查看-->
@@ -1159,7 +1161,7 @@
 </template>
 
 <script>
-import { listCorps, addmodify, getCntr, postApproval, listFees,getGoodName} from '@/api/kaihe/domesticTrade/orderInformation'
+import { listCorps, addmodify, getCntr, postApproval, listFees,getGoodName,getFName} from '@/api/kaihe/domesticTrade/orderInformation'
 import Global from '@/layout/components/global'
 import { getToken } from '@/utils/auth'
 import Cookies from 'js-cookie'
@@ -1230,6 +1232,9 @@ export default {
   },
   data() {
     return {
+      approVal: false,
+      //客户名称下拉模糊
+      nameOptions:[],
       //字典表包装类型
       packgeOptions:[],
       //货名下拉
@@ -1290,32 +1295,45 @@ export default {
       select: '',
       querDate: [],
       file: [],
-      row: []
+      row: [],
+      res:[]
     }
   },
-
   //页面跳转后传递参数
   activated() {
-    let formDate = JSON.parse(this.$route.query.data)
-    console.log(formDate)
-    // this.querDate = JSON.parse(this.$route.query.data)
+    let formDate
+    if (this.$route.query.list){
+      formDate = {
+        fId: JSON.parse(this.$route.query.list).billId
+      }
+      this.approVal = true;
+    }else if(this.$route.query.data){
+      formDate = JSON.parse(this.$route.query.data)
+      this.approVal = false;
+    }
     if (formDate) {
       addmodify(formDate).then(response => {
         this.form = response.rows[0]
         this.goodsList = response.rows[0].tWarehousebillsCntrList
         this.estimatedTime = response.rows[0].tVoyageL
         this.dataList = response.rows[0].tWarehousebillsCntritemsList
-        this.warehouseDrList = response.rows[0].tWarehousebillsfeesDr
-        this.warehouseCrList = response.rows[0].warehousebillsfeesCr
         this.loading = false
+        if (response.rows[0].tWarehousebillsfeesDr){
+          this.warehouseDrList = response.rows[0].tWarehousebillsfeesDr
+          for(let item in this.warehouseDrList){
+            this.$set(this.warehouseDrList[item],'fFeeUnitid',JSON.stringify(this.warehouseDrList[item].fFeeunitid))
+          }
+        }
+        if (response.rows[0].warehousebillsfeesCr){
+          this.warehouseCrList = response.rows[0].warehousebillsfeesCr
+          for(let item in this.warehouseCrList){
+            this.$set(this.warehouseCrList[item],'fFeeUnitid',JSON.stringify(this.warehouseCrList[item].fFeeunitid))
+          }
+        }
       })
     }
-
   },
   created() {
-    // getContainer().then(response=>{
-    //   console.log(response)
-    // })
     this.getDicts("data_unitfees").then((response) => {
       if (response.data) {
         this.jFeetunitOptions = response.data;
@@ -1332,20 +1350,37 @@ export default {
       }
     });
     this.getDicts("f_packageid").then((response) => {
-      console.log(response)
       if (response.data) {
         this.packgeOptions = response.data
       }
     });
     this.cntrtypeRemoteMethod()
     this.goodRemoteMethod()
+    this.nameRemoteMethod()
+    this.fWRemoteMethod()
+    let queryParams = { pageNum: 1, fDc: "C" };
+    listFees(queryParams).then((response) => {
+      this.fCNameOptions = response.rows;
+    });
+    let query = { pageNum: 1, fDc: "D" };
+    listFees(query).then((response) => {
+      this.fDNameOptions = response.rows;
+    });
+    // this.name()
   },
   methods: {
+
+    //获取客户名称下拉
+    nameRemoteMethod(){
+      let queryParams = { pageNum: 1 }
+      getFName(queryParams).then(response=>{
+        this.nameOptions = response.data
+      })
+    },
     //货名下拉
     goodRemoteMethod(){
       let queryParams = { pageNum: 1 }
       getGoodName(queryParams).then(response=>{
-        console.log(response)
         this.goodsOptions = response.data
 
       })
@@ -1354,29 +1389,27 @@ export default {
     cntrtypeRemoteMethod(){
       let queryParams = { pageNum: 1 }
       getCntr(queryParams).then(response=>{
-        console.log(response)
         this.cntrOptions = response.rows
       })
     },
     //计价单位
-    corpsRemoteMethod(name) {
-      if (name == null || name === "") {
-        return false;
-      }
-      let queryParams = { pageNum: 1, fName: name, type: 1 };
-      listCorps(queryParams).then((response) => {
-        this.fMblnoOptions = response.rows;
-        this.KHblnoOptions = response.rows;
-        console.log(this.KHblnoOptions);
-      });
-    },
+    // corpsRemoteMethod(name) {
+    //   if (name == null || name === "") {
+    //     return false;
+    //   }
+    //   let queryParams = { pageNum: 1, fName: name, type: 1 };
+    //   listCorps(queryParams).then((response) => {
+    //     this.fMblnoOptions = response.rows;
+    //     this.KHblnoOptions = response.rows;
+    //   });
+    // },
 
     //应付信息新行
     addpayment() {
       this.warehouseCrList.push({
-        fCorpid: null,
+        fName: null,
         fFeeid: null,
-        fFeeUnitid: "",
+        fFeeUnitid: '7',
         fQty: null,
         fUnitprice: null,
         fAmount: null,
@@ -1406,19 +1439,10 @@ export default {
       this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
     },
 
-    modifyInfo(){
-      this.modify = false
-      let queryParams = { pageNum: 1, fDc: "C" };
-      listFees(queryParams).then((response) => {
-        this.fCNameOptions = response.rows;
-        console.log(this.fCNameOptions)
-      });
-      let query = { pageNum: 1, fDc: "D" };
-      listFees(query).then((response) => {
-        this.fDNameOptions = response.rows;
-        console.log(this.fDNameOptions)
-      });
-    },
+    // modifyInfo(){
+    //   this.
+    //
+    // },
     // 变更计价单位
     changeFeeUnit(row) {
       if (!row.fFeeUnitid) {
@@ -1446,15 +1470,15 @@ export default {
     },
 
     // 选择费用信息时获取计价单位
-    changeFeeId(row) {
-      for (let li in this.fWbuOptions) {
-        if (row.fFeeid === this.fWbuOptions[li].fId) {
-          this.$set(row, "fFeeUnitid", this.fWbuOptions[li].fFeeunitid + "");
-          this.changeFeeUnit(row);
-          break;
-        }
-      }
-    },
+    // changeFeeId(row) {
+    //   for (let li in this.fWbuOptions) {
+    //     if (row.fFeeid === this.fWbuOptions[li].fId) {
+    //       this.$set(row, "fFeeUnitid", this.fWbuOptions[li].fFeeunitid + "");
+    //       this.changeFeeUnit(row);
+    //       break;
+    //     }
+    //   }
+    // },
     // 远程模糊查询费用名称
     fWRemoteMethod(name) {
       if (name == null || name === "") {
@@ -1502,7 +1526,13 @@ export default {
     addOrUpdateHand(form) {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
-        this.$refs.ApprovalComments.init(form.fId, 420);
+        let actId = ''
+        if(this.form.fBillstatus < 6){
+          actId = "410"
+        }else{
+          actId = "420";
+        }
+        this.$refs.ApprovalComments.init(form.fId, actId);
       });
     },
     //首页审批跳转关闭返回首页
@@ -1543,19 +1573,26 @@ export default {
     addOrUpdateHandle() {
       this.addOrUpdateVisible = true;
       let id = "448";
-      let actId = "420";
+      let actId = ''
+      if(this.form.fBillstatus < 6){
+        actId = "410"
+      }else{
+        actId = "420";
+      }
       this.$nextTick(() => {
         this.$refs.addOrUpdate.init(this.form.fId, actId);
       });
     },
-
+    deleteRoww(index, rows) {
+      rows.splice(index, 1);
+    },
     handleSelect(){},
     //应收新行
     addCollection(){
       this.warehouseDrList.push({
-        fCorpid: null,
+        fName: null,
         fFeeid: null,
-        fFeeUnitid: "",
+        fFeeUnitid: '7',
         fQty: null,
         fUnitprice: null,
         fAmount: null,
@@ -1578,7 +1615,6 @@ export default {
         this.$message.error("请维护提单号")
         return false
       }
-      console.log(this.dataList)
       if(this.dataList.length === 0){
         this.$message.error("请维护箱信息")
         return false
@@ -1587,42 +1623,33 @@ export default {
         fId:this.form.fId,
         fMblno:this.form.fMblno
       }
-      console.log(this.warehouseDrList)
       let formData = new window.FormData();
       formData.append("tWarehousebills",JSON.stringify(form))
       formData.append("tWarehousebillsCntritems",JSON.stringify(this.dataList))
       formData.append("tWarehousebillsfeesDr",JSON.stringify(this.warehouseDrList))
       formData.append("tWarehousebillsfeesCr",JSON.stringify(this.warehouseCrList))
-
       postApproval(formData).then(response=>{
-        this.msgSuccess("提交成功");
-        console.log(response)
+        this.msgSuccess("操作成功");
         if(response.data.tWarehouseBills){
-          this.form.fMblno = tWarehouseBills
+          this.form = response.data.tWarehouseBills
         }
         if(response.data.tWarehousebillsCntritemsList){
-
+          this.dataList = response.data.tWarehousebillsCntritemsList
         }
         if(response.data.warehousebillsfeesCrList){
           this.warehouseCrList = response.data.warehousebillsfeesCrList
-          console.log(this.warehouseDrList)
           for(let item in this.warehouseCrList){
-            // this.$set(this.warehouseDrList[item],'fFeeunitid',parseInt(this.warehouseDrList[item].fFeeunitid + ""))
-            this.$set(this.warehouseCrList[item],'fFeeUnitid',JSON.stringify(this.warehouseCrList[item].fFeeunitid))
-            console.log(typeof(this.warehouseDrList[item].fFeeunitid))
+              this.$set(this.warehouseCrList[item],'fFeeUnitid',JSON.stringify(this.warehouseCrList[item].fFeeunitid))
           }
         }
         if(response.data.warehousebillsfeesDrList){
           this.warehouseDrList = response.data.warehousebillsfeesDrList
-          console.log(this.warehouseDrList)
             for(let item in this.warehouseDrList){
-              // this.$set(this.warehouseDrList[item],'fFeeunitid',parseInt(this.warehouseDrList[item].fFeeunitid + ""))
-              this.$set(this.warehouseDrList[item],'fFeeUnitid',JSON.stringify(this.warehouseDrList[item].fFeeunitid))
-              console.log(typeof(this.warehouseDrList[item].fFeeunitid))
+                this.$set(this.warehouseDrList[item],'fFeeUnitid',JSON.stringify(this.warehouseDrList[item].fFeeunitid))
             }
-        }
-      })
-    },
+          }
+        })
+      },
     //新行
     addList(){
       this.dataList.push({
@@ -1639,96 +1666,17 @@ export default {
     check(status){
       this.dialogVisible = true
       if(status === 1){
-        console.log(status)
       }else{
-        console.log(status)
       }
     },
     saveFile() {
       this.row.accessoryList = this.file
       this.dialogVisible = false
       this.relevantAttachments = []
-      console.log(this.row)
     },
     deleteRow(index, rows) {
       rows.splice(index, 1)
     },
-    //提交修改数据
-    determine() {
-      let data = []
-      for (let item in this.select) {
-        console.log(this.select[item])
-        for (let li in this.corpsList) {
-          if (!this.select[item].foldSite) {
-            this.$message.error('请选择调入地点')
-            return false
-          } else if (!this.select[item].fOpctnstatus) {
-            this.$message.error('请选择调箱动态')
-            return false
-          } else {
-            if (!this.select[item].foldFUpdateef) {
-              this.select[item].foldFUpdateef = this.corpsList[li].updateEFName
-              this.$set(this.select[item], 'FUpdateef', this.corpsList[li].fUpdateef)
-            }
-            if (!this.select[item].foldFCntrstatus) {
-              this.select[item].foldFCntrstatus = this.corpsList[li].cntrstatusName
-              this.$set(this.select[item], 'FCntrstatus', this.corpsList[li].fCntrstatus)
-            }
-          }
-        }
-
-        data.push({
-          fId: this.select[item].fId,
-          foldSite: this.select[item].fold,
-          foldFUpdateef: this.select[item].FUpdateef,
-          foldFCntrstatus: this.select[item].FCntrstatus,
-          foldtime: this.select[item].foldtime,
-          fVsl: this.select[item].fVsl,
-          fVoy: this.select[item].fVoy,
-          fMblno: this.select[item].fMblno,
-          fOpctnstatus: this.select[item].boxAdjustmentAction,
-          remark: this.select[item].remark,
-          accessoryList: this.file
-        })
-      }
-
-      let tCntrno = data
-      listCorps(tCntrno).then(response => {
-        this.$message.success('提交成功')
-        // this.$router.push({
-        //   path: "/containerNews/boxDistribution",
-        // });
-        console.log(this.corpsList.length)
-        if (this.querDate) {
-          addmodify(this.querDate).then(response => {
-            this.corpsList = response.rows
-            this.loading = false
-            if (response.rows.length === 0) {
-              let view = {
-                fullPath: '/containerNews/modifyPage?data=%7B%22typeidName%22%3A%221%22,%22fUpdateaddress%22%3A%22%E5%B1%B1%E4%B8%9C%22%7D',
-                hash: '',
-                matched: Array(2),
-                meta: Object,
-                name: 'ModifyPage',
-                params: Object,
-                path: '/containerNews/modifyPage',
-                query: Object,
-                title: '修改页面'
-              }
-              this.$router.push({ path: '/containerNews/boxDistribution' })
-              this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
-                if (this.isActive(view)) {
-                  this.toLastView(visitedViews, view)
-                }
-              })
-              Global.$emit('removeCache', 'closeSelectedTag', view)
-            }
-
-          })
-        }
-        console.log(this.corpsList.length)
-      })
-    },
     //多选框选中
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.fId)

+ 92 - 0
src/views/morePage/stock/index.vue

@@ -42,6 +42,7 @@
           <span v-else-if="scope.row.refno2 === 'DZ'">对账</span>
           <span v-else-if="scope.row.refno2 === 'FF'">付费</span>
           <span v-else-if="scope.row.refno2 === 'JSCCF'">计算仓储费</span>
+          <span v-else-if="scope.row.refno2 === 'SE'">下单配船</span>
         </template>
       </el-table-column>
       <el-table-column prop="address" label="操作" width="80">
@@ -110,6 +111,97 @@ export default {
         this.loading = false;
       });
     },
+    approval(row) {
+      switch (row.refno2) {
+        case "SJRK": {
+          this.$router.push({
+            path: "/business/inStock",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "SJCK": {
+          this.$router.push({
+            path: "/business/outStock",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "HQZY": {
+          this.$router.push({
+            path: "/business/goodsTransfer",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "CKDB": {
+          this.$router.push({
+            path: "/business/stockTransfer",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "HWTG": {
+          this.$router.push({
+            path: "/business/cargoClearance",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "JSCCF": {
+          this.$router.push({
+            path: "/business/agreement",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "CCF": {
+          this.$router.push({
+            path: "/agreement/agreementStorage",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "ZYF": {
+          this.$router.push({
+            path: "/agreement/agreementTask",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "SF": {
+          this.$router.push({
+            path: "/finance/charge",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "DZ": {
+          this.$router.push({
+            path: "/finance/contrast",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "FF": {
+          this.$router.push({
+            path: "/finance/payment",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "SE": {
+          this.$router.push({
+            path: "/domesticTrade/orderInformation",
+            query: { list: JSON.stringify(row) },
+          });
+          break;
+        }
+        default: {
+          return this.$message.error("未知错误,无状态");
+        }
+      }
+    },
     querytoDo(res) {
       this.dialogVisible = true;
       this.text = res;