提交凯和改单审批配置

src/views/basicdata/corps/index.vue

@@ -159,38 +159,38 @@
       </div>
       <div style="padding: 4px; display: flex; justify-content: center">
         <draggable
-          v-model="setRowList"
-          group="site"
-          animation="300"
-          @start="onStart"
-          @end="onEnd"
-          handle=".indraggable"
+            v-model="setRowList"
+            group="site"
+            animation="300"
+            @start="onStart"
+            @end="onEnd"
+            handle=".indraggable"
         >
           <transition-group>
-            <divindex
-              v-for="(item,index) in setRowList"
-              :key="index.surface"
-              class="listStyle"
+            <div
+                v-for="item in setRowList"
+                :key="item.surface"
+                class="listStyle"
             >
               <div style="width: 500px" class="indraggable">
                 <div class="progress" :style="{ width: item.width + 'px' }">
                   <el-checkbox
-                    :label="item.name"
-                    v-model="item.checked"
-                    :true-label="0"
-                    :false-label="1"
-                    >{{ item.name }}
+                      :label="item.name"
+                      v-model="item.checked"
+                      :true-label="0"
+                      :false-label="1"
+                  >{{ item.name }}
                   </el-checkbox>
                 </div>
               </div>
               <el-input-number
-                v-model.number="item.width"
-                controls-position="right"
-                :min="1"
-                :max="500"
-                size="mini"
+                  v-model.number="item.width"
+                  controls-position="right"
+                  :min="1"
+                  :max="500"
+                  size="mini"
               ></el-input-number>
-            </divindex>
+            </div>
           </transition-group>
         </draggable>
       </div>

src/views/index.vue

@@ -181,6 +181,9 @@
                   <span v-else-if="item.refno2 === 'SE'">下单配船</span>
                   <span v-else-if="item.refno2 === 'SJRKITEM'">入库明细审批</span>
                   <span v-else-if="item.refno2 === 'SJCKITEM'">出库明细审批</span>
+                  <span v-else-if="item.refno2 === 'XGDD'">申请变更</span>
+                  <span v-else-if="item.refno2 === 'XGTJ'">提交变更</span>
+                  <span v-else-if="item.refno2 === 'DDSC'">申请删单</span>
                 </div>
                 <div class="home_stock_table" @click="approval(item)">
                   查看详情
@@ -719,6 +722,11 @@
                 <span v-else-if="item.refno2 === 'ApplyFP'">凯和开票申请</span>
                 <span v-else-if="item.refno2 === 'KHDD'">凯和订单</span>
                 <span v-else-if="item.refno2 === 'SE'">下单配船</span>
+                <span v-else-if="item.refno2 === 'SJRKITEM'">入库明细审批</span>
+                <span v-else-if="item.refno2 === 'SJCKITEM'">出库明细审批</span>
+                <span v-else-if="item.refno2 === 'XGDD'">申请变更</span>
+                <span v-else-if="item.refno2 === 'XGTJ'">提交变更</span>
+                <span v-else-if="item.refno2 === 'DDSC'">申请删单</span>
               </div>
               <div class="home_stock_table" @click="approval(item)">
                 立即审批
@@ -1057,6 +1065,28 @@ export default {
           });
           break;
         }
+
+        case "XGDD": {
+          this.$router.push({
+            path: "/domesticTrade/orderInformation",
+            query: {testing:JSON.stringify(row)},
+          });
+          break;
+        }
+        case "XGTJ": {
+          this.$router.push({
+            path: "/domesticTrade/orderInformation",
+            query: {testing:JSON.stringify(row)},
+          });
+          break;
+        }
+        case "DDSC": {
+          this.$router.push({
+            path: "/domesticTrade/orderInformation",
+            query: {testing:JSON.stringify(row)},
+          });
+          break;
+        }
         default: {
           return this.$message.error("未知错误，无状态");
         }

src/views/kaihe/domesticTrade/myOrder/index.vue

@@ -13,9 +13,9 @@
       <el-menu-item index="2">订舱审核通过</el-menu-item>
       <el-menu-item index="3">待配船</el-menu-item>
       <el-menu-item index="4">配船审核通过</el-menu-item>
-      <el-menu-item index="5">已撤销</el-menu-item>
-      <el-menu-item index="6">已驳回</el-menu-item>
-      <el-menu-item index="7">运单变更</el-menu-item>
+<!--      <el-menu-item index="5">已撤销</el-menu-item>-->
+      <el-menu-item index="10">已驳回</el-menu-item>
+      <el-menu-item index="12">运单变更</el-menu-item>
 
     </el-menu>
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" style="margin-top:20px">
@@ -563,6 +563,10 @@
           this.queryParams.fBillstatus = 11
         }else if(key === '7'){
           this.queryParams.fBillstatus = 12
+        }else if (key === '10'){
+          this.queryParams.fBillstatus = 10
+        }else if (key === '12'){
+          this.queryParams.fBillstatus = 12
         }
         listCorps(this.queryParams).then(response => {
           this.corpsList = response.rows;

src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -42,7 +42,7 @@
                   v-model="form.loadportidName"
                   size="small"
                   style="width: 100%"
-                  :disabled="doNot"
+                  :disabled="modify"
                 />
               </el-form-item>
             </el-col>
@@ -50,7 +50,7 @@
               <el-form-item label="目的港口" prop="destportidName">
                 <el-input
                   v-model="form.destportidName"
-                  :disabled="doNot"
+                  :disabled="modify"
                   size="small"
                   style="width: 100%"
                 />
@@ -159,7 +159,7 @@
               <el-form-item label="船名" prop="vslidName">
                 <el-input
                   v-model="form.vslidName"
-                  :disabled="doNot"
+                  :disabled="modify"
                   size="small"
                   style="width: 100%"
                 />
@@ -170,7 +170,7 @@
               <el-form-item label="航次" prop="voyidName">
                 <el-input
                   v-model="form.voyidName"
-                  :disabled="doNot"
+                  :disabled="modify"
                   size="small"
                   style="width: 100%"
                 />
@@ -180,7 +180,7 @@
             <el-col :span="14">
               <el-form-item label="备注" prop="remarks">
                 <el-input
-                  v-model="form.remarks"
+                  v-model="form.remark"
                   :disabled="modify"
                   size="small"
                   style="width: 75%"
@@ -1260,15 +1260,25 @@
       >费用请核
       </el-button>
       <el-button type="success" v-if="approVal" @click="addOrUpdateHand(form,'f_billstatus')">审 批</el-button>
+      <el-button type="primary"
+                 v-if="(form.fUpdeteStatus === 4 || form.fUpdeteStatus === 5 || form.fUpdeteStatus === 6 || form.fUpdeteStatus === 2) && (form.fSubmitUpdate == 2 || form.fSubmitUpdate == 4) && (form.fDeleteStatus === 2 || form.fDeleteStatus === 4) && approvalTwo"
+                 @click="modifyApproval()"
+      >审批
+      </el-button>
       <el-button type="danger" :disabled="disappear" v-if="form.moneyStatus === 4 && current == before"
                  @click="revokeTwo('f_billstatus')"
       >撤销请核
       </el-button>
       <el-button type="primary"
-                 v-if="form.fBillstatus != 11 ||form.moneyStatus == null || form.moneyStatus != null && form.moneyStatus >= 4"
+                 v-if="(form.fUpdeteStatus !== 4 && form.fUpdeteStatus !== 5 && form.fUpdeteStatus !== 6 && form.fUpdeteStatus !== 2) && (form.fBillstatus != 11 ||form.moneyStatus == null || form.moneyStatus != null && form.moneyStatus >= 4)"
                  @click="addOrUpdateHandle('f_billstatus')"
       >查看审批
       </el-button>
+      <el-button type="primary"
+                 v-if="(form.fUpdeteStatus === 4 || form.fUpdeteStatus === 5 || form.fUpdeteStatus === 6 || form.fUpdeteStatus === 2) && (form.fSubmitUpdate == 2 || form.fSubmitUpdate == 4) && (form.fDeleteStatus === 2 || form.fDeleteStatus === 4)"
+                 @click="revisionApproval()"
+      >查看审批
+      </el-button>
       <el-button icon="el-icon-arrow-left" type="danger" v-if="cancelButton === true" @click="cancel">返回列表</el-button>
       <el-button icon="el-icon-arrow-left" type="danger" v-if="cancelButton === false" @click="cancelTwo"
       >返回首页
@@ -1543,6 +1553,7 @@ export default {
       row: [],
       res: [],
       formList:{},
+      approvalTwo:false,
       amountDr:null,
       amountCr:null
     }
@@ -1568,9 +1579,18 @@ export default {
         fId: formDate.fId
       }
       this.approVal = false
+    }else if (this.$route.query.testing){
+      console.log(this.$route.query.testing)
+      formDate = {
+        fId:JSON.parse(this.$route.query.testing).billId
+      }
+      this.formList = formDate
+      this.approvalTwo = true
+      this.cancelButton = false
     }
     if (formDate) {
       addmodify(formDate).then(response => {
+        console.log(response)
         if(response.code == 200){
           this.form = response.rows[0]
           if (this.form.fMblno == null) {
@@ -2144,6 +2164,23 @@ export default {
         }
       })
     },
+    modifyApproval(){
+      this.addOrUpdateVisib = true
+      let list = JSON.parse(this.$route.query.testing)
+      this.$nextTick(() => {
+        let actId = ''
+        console.log(list)
+        this.addOrUpdateVisible = true
+        if(list.refno4 == 'XGDD'){
+          actId = 471
+        }else if (list.refno4 == 'XGTJ'){
+          actId = 472
+        }else if(list.refno4 == 'DDSC'){
+          actId = 473
+        }
+        this.$refs.ApprovalComments.init(this.form.fId,status,actId,this.form.fMblno)
+      })
+    },
     //首页审批跳转关闭返回首页
     cancelTwo() {
       this.open = false
@@ -2178,7 +2215,22 @@ export default {
       this.open = false
       this.cancelTwo()
     },
-
+    revisionApproval(){
+      let list = JSON.parse(this.$route.query.testing)
+      let actId = ''
+      console.log(list)
+      this.addOrUpdateVisible = true
+      if(list.refno4 == 'XGDD'){
+        actId = 471
+      }else if (list.refno4 == 'XGTJ'){
+        actId = 472
+      }else if(list.refno4 == 'DDSC'){
+        actId = 473
+      }
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(this.form.fId,actId,list.fidStatus)
+      })
+    },
     addOrUpdateHandle(status) {
       this.addOrUpdateVisible = true
       let id = '448'

src/views/morePage/stock/index.vue

@@ -692,6 +692,18 @@ export default {
                 e.refno2 = "出库明细审批";
                 break;
               }
+              case "XGDD": {
+                e.refno2 = "申请变更";
+                break;
+              }
+              case "XGTJ": {
+                e.refno2 = "提交变更";
+                break;
+              }
+              case "DDSC": {
+                e.refno2 = "申请删单";
+                break;
+              }
               default: {
                 return this.$message.error("未知错误，无状态");
               }
@@ -704,7 +716,6 @@ export default {
       });
     },
     approval(row) {
-      console.log(row);
       switch (row.refno4) {
         case "SJRK": {
           this.$router.push({
@@ -832,6 +843,27 @@ export default {
           });
           break;
         }
+        case "XGDD": {
+          this.$router.push({
+            path: "/domesticTrade/orderInformation",
+            query: {testing:JSON.stringify(row)},
+          });
+          break;
+        }
+        case "XGTJ": {
+          this.$router.push({
+            path: "/domesticTrade/orderInformation",
+            query: {testing:JSON.stringify(row)},
+          });
+          break;
+        }
+        case "DDSC": {
+          this.$router.push({
+            path: "/domesticTrade/orderInformation",
+            query: {testing:JSON.stringify(row)},
+          });
+          break;
+        }
         default: {
           console.log(row);
           return this.$message.error("未知错误，无状态");

src/views/system/auditConfiguration/index.vue

@@ -57,6 +57,9 @@
           <span v-if="scope.row.actId === 470">凯和发票申请审批流程</span>
           <span v-if="scope.row.actId === 170">入库明细审批流程</span>
           <span v-if="scope.row.actId === 180">出库明细审批流程</span>
+          <span v-if="scope.row.actId === 471">凯和商务端申请修改订单审批</span>
+          <span v-if="scope.row.actId === 472">凯和商务端修改订单提交审批</span>
+          <span v-if="scope.row.actId === 473">凯和商务端删除订单审批</span>
         </template>
       </el-table-column>
       <el-table-column

vue.config.js

@@ -35,13 +35,14 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://192.168.1.143:9010/`,
+        // target: `https://test.fms.tubaosoft.com/prod-api/`,
         // target: `http://test.wms.tubaosoft.com/prod-api/`,
         // target: `https://zd.tubaosoft.com/prod-api/`,
         // target: `https://jianqiao.tubaosoft.com/prod-api/`,
         // target: `https://jiyong.tubaosoft.com/prod-api/`,
         // target: `https://dmu.tubaosoft.com/prod-api/`,
         // target: `http://jingang.tubaosoft.com/prod-api/`,
-        target: `https://op.khzclogistics.com/`,
+        target: `https://op.khzclogistics.com/prod-api/`,
         // 华为10M
         // target: `http://121.36.212.131:9010/`,
         // target: `http://121.36.212.131:9020/`,