ow拿ow放新加修改功能

src/api/boxManagement/buyContainer/index.js

@@ -250,4 +250,11 @@ export const getAccurate = (params) => {
     method: 'get',
     params: params
   })
+}
+export function synchronousPutBoxData(data) {
+  return request({
+    url: '/api/blade-los/tradingBox/synchronousPutBoxData',
+    method: 'post',
+    data: data
+  })
 }

src/views/ow/owPut/detailsPage.vue

@@ -20,6 +20,10 @@
           :disabled="isSaveBtn" @click="submit">保 存
         </el-button>
         <el-button type="info" size="small" @click="allClick('启用')">启用</el-button>
+        <el-button v-if="form.whetherEnable == '是'" type="danger" size="small"
+          @click="allClick('修改数据')">修改数据</el-button>
+        <el-button v-if="form.whetherEnable == '是'" type="success" size="small"
+          @click="allClick('提交修改')">提交修改</el-button>
         <!-- <el-button v-if="form.status == '审核提交'" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
           size="small" @click="revokeApplication">撤销单据请核
         </el-button> -->
@@ -43,7 +47,7 @@
               <tempalte slot="purchaseCompanyName">
                 <dic-select v-model="form.purchaseCompanyName" placeholder="USER" key="id" label="shortName"
                   res="records" @selectChange="dicChange('purchaseCompanyName', $event)"
-                  :disabled="form.whetherEnable == '是'"
+                  :disabled="(fixData && form.whetherEnable == '是')"
                   url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东" :filterable="true"
                   :remote="true" dataName="shortName" :slotRight="true" rightLabel="code">
                 </dic-select>
@@ -56,7 +60,8 @@
                 </dic-select> -->
                 <container-number v-model="form.containerNumber" placeholder="放箱号" label="containerNumber"
                   :url="'/blade-los/putbox/selectContainerNumber?boxType=' + (form.boxTypeQuantityOne ? form.boxTypeQuantityOne : '') + '&polId=' + (form.polId ? form.polId : '') + '&podId=' + (form.podId ? form.podId : '') + '&polStationId=' + (form.polStationId ? form.polStationId : '')"
-                  @selectChange="dicChange('containerNumber', $event)" :titleDialog="放箱号"></container-number>
+                  @selectChange="dicChange('containerNumber', $event)" :titleDialog="放箱号"
+                  :disabled="editDisabled ||form.whetherEnable == '是'"></container-number>
               </tempalte>
               <!-- <tempalte slot="polStationCname">
                 <dic-select v-model="form.polStationCname" placeholder="起运港提/送箱场站" key="id" label="cnName" res="records"
@@ -75,7 +80,7 @@
                 <dic-select v-model="form.podStationCname" placeholder="目的港还箱场站" key="id" label="cnName" res="records"
                   url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0" :filterable="true"
                   :remote="true" dataName="cnName" @selectChange="dicChange('podStationCname', $event)"
-                  :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true"
+                  :disabled="editDisabled ||  (fixData && form.whetherEnable == '是')" :slotRight="true"
                   rightLabel="code"></dic-select>
               </tempalte>
               <tempalte slot="polCname">
@@ -91,13 +96,13 @@
                   :url="'/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0&ids=' + (form.cyText ? form.cyText : '')"
                   :filterable="true" :remote="true" dataName="cnName"
                   @selectChange="dicChange('polStationCname', $event)"
-                  :disabled="editDisabled || !form.polCname || form.whetherEnable == '是'"></dic-select>
+                  :disabled="editDisabled || !form.polCname ||  (fixData && form.whetherEnable == '是')"></dic-select>
               </tempalte>
               <tempalte slot="podCname">
                 <dic-select v-model="form.podCname" placeholder="港口" label="code"
                   url="/blade-los/bports/listAll?status=0" :filterable="true" :multiple="true" :collapseTags="true"
                   dataType="string" @selectChange="dicChange('podCname', $event)"
-                  :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true"
+                  :disabled="editDisabled ||form.whetherEnable == '是'" :slotRight="true"
                   rightLabel="code"></dic-select>
               </tempalte>
               <template slot="boxTypeQuantityOne">
@@ -112,7 +117,8 @@
                 <!-- <el-link type="primary" :underline="false" @click.stop="openRtDialog">箱租金条款</el-link> -->
               </template>
               <template slot="boxNumber">
-                <el-input-number v-model="form.boxNumber" :disabled="editDisabled || form.whetherEnable == '是'" :min="1"
+                <el-input-number v-model="form.boxNumber"
+                  :disabled="editDisabled || (fixData && form.whetherEnable == '是') || form.suitcaseNum != 0" :min="1"
                   :controls="false" placeholder="请输入 箱量" style="width: 100%;"></el-input-number>
               </template>
             </avue-form>
@@ -608,7 +614,8 @@ import {
   submitRtList,
   pleaseVerifyCost,
   batchUpdatePodStation,
-  getAccurate
+  getAccurate,
+  synchronousPutBoxData
 } from "@/api/boxManagement/buyContainer";
 import dicSelect from "@/components/dicSelect/main";
 import containerNumber from "@/components/dicSelect/containerNumber";
@@ -2054,7 +2061,8 @@ export default {
       updateFormKey: new Date().getTime(),
       updateStationKey: new Date().getTime(),
       containerNumberKey: new Date().getTime(),
-      deptId: JSON.parse(localStorage.getItem('sysitemData')).deptId
+      deptId: JSON.parse(localStorage.getItem('sysitemData')).deptId,
+      fixData: true,
     }
   },
   components: {
@@ -2255,7 +2263,7 @@ export default {
     dicChange(name, row) {
       if (name == 'containerNumber') {
         if (row) {
-          this.form.containerNumber =row.containerNumber
+          this.form.containerNumber = row.containerNumber
           this.form.boxCondition = row.boxCondition
           this.form.polId = row.polId
           this.form.polCode = row.polCode
@@ -2840,6 +2848,27 @@ export default {
         }
         this.activationDialog = true
       }
+      if (name == '修改数据') {
+        this.fixData = false
+        this.optionForm.column.forEach(e => {
+          if (!(e.prop == 'internalContainerNumber' || e.prop == 'suitcaseNum' || e.prop == 'notSuitcaseNum')) {
+            e.disabled = false
+          }
+        })
+      }
+      if (name == '提交修改') {
+        this.$confirm("确认提交修改?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          synchronousPutBoxData(this.form).then(res => {
+            this.$message.success("操作成功");
+            this.fixData=true
+            this.getDetail(this.form.id)
+          })
+        })
+      }
       if (name == 'D费用一键保存') {
         if (!this.feeCenterListD.length) {
           return this.$message.error("请添加数据");

src/views/ow/owTask/detailsPage.vue

@@ -20,6 +20,10 @@
           :disabled="isSaveBtn" @click="submit">保 存
         </el-button>
         <el-button type="info" size="small" @click="allClick('启用')">启用</el-button>
+        <el-button v-if="form.whetherEnable == '是'" type="danger" size="small"
+          @click="allClick('修改数据')">修改数据</el-button>
+        <el-button v-if="form.whetherEnable == '是'" type="success" size="small"
+          @click="allClick('提交修改')">提交修改</el-button>
         <!-- <el-button v-if="form.status == '审核提交'" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
           size="small" @click="revokeApplication">撤销单据请核
         </el-button> -->
@@ -43,7 +47,7 @@
               <tempalte slot="purchaseCompanyName">
                 <dic-select v-model="form.purchaseCompanyName" placeholder="箱东" key="id" label="shortName" res="records"
                   @selectChange="dicChange('purchaseCompanyName', $event)"
-                  :disabled="editDisabled || form.whetherEnable == '是'"
+                  :disabled="editDisabled || (fixData && form.whetherEnable == '是')"
                   url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东" :filterable="true"
                   :remote="true" dataName="shortName" :slotRight="true" rightLabel="code">
                 </dic-select>
@@ -59,14 +63,14 @@
                 <dic-select v-model="form.polCyCname" placeholder="港口" key="id" label="cnName" res="records"
                   url="/blade-los/bports/list?status=0&current=1&size=5" :filterable="true" :remote="true"
                   dataName="cnName" @selectChange="dicChange('polCyCname', $event)"
-                  :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true"
+                  :disabled="editDisabled || (fixData && form.whetherEnable == '是')" :slotRight="true"
                   rightLabel="code"></dic-select>
               </tempalte>
               <tempalte slot="podStationCname">
                 <dic-select v-model="form.podStationCname" placeholder="目的港还箱场站" key="id" label="cnName" res="records"
                   url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0" :filterable="true"
                   :remote="true" dataName="cnName" @selectChange="dicChange('podStationCname', $event)"
-                  :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true"
+                  :disabled="editDisabled || (fixData && form.whetherEnable == '是')" :slotRight="true"
                   rightLabel="code"></dic-select>
               </tempalte>
               <tempalte slot="polCname">
@@ -82,7 +86,7 @@
                   :url="'/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0&ids=' + (form.cyText ? form.cyText : '')"
                   :filterable="true" :remote="true" dataName="cnName"
                   @selectChange="dicChange('polStationCname', $event)"
-                  :disabled="editDisabled || !form.polCname || form.whetherEnable == '是'"></dic-select>
+                  :disabled="editDisabled || !form.polCname || (fixData && form.whetherEnable == '是')"></dic-select>
               </tempalte>
               <tempalte slot="podCname">
                 <dic-select v-model="form.podCname" placeholder="港口" label="code"
@@ -102,7 +106,8 @@
                 <!-- <el-link type="primary" :underline="false" @click.stop="openRtDialog">箱租金条款</el-link> -->
               </template>
               <template slot="boxNumber">
-                <el-input-number v-model="form.boxNumber" :disabled="editDisabled || form.whetherEnable == '是'" :min="1"
+                <el-input-number v-model="form.boxNumber"
+                  :disabled="editDisabled || (fixData && form.whetherEnable == '是') || form.suitcaseNum != 0" :min="1"
                   :controls="false" placeholder="请输入 箱量" style="width: 100%;"></el-input-number>
               </template>
             </avue-form>
@@ -599,7 +604,8 @@ import {
   submitRtList,
   pleaseVerifyCost,
   batchUpdatePodStation,
-  getAccurate
+  getAccurate,
+  synchronousPutBoxData
 } from "@/api/boxManagement/buyContainer";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -2018,7 +2024,8 @@ export default {
       updateSearchKey: new Date().getTime(),
       updateFormKey: new Date().getTime(),
       updateStationKey: new Date().getTime(),
-      deptId: JSON.parse(localStorage.getItem('sysitemData')).deptId
+      deptId: JSON.parse(localStorage.getItem('sysitemData')).deptId,
+      fixData: true,
     }
   },
   components: {
@@ -2780,6 +2787,27 @@ export default {
         }
         this.activationDialog = true
       }
+      if (name == '修改数据') {
+        this.fixData = false
+        this.optionForm.column.forEach(e => {
+          if (!(e.prop == 'containerNumber' || e.prop == 'internalContainerNumber' || e.prop == 'suitcaseNum' || e.prop == 'notSuitcaseNum')) {
+            e.disabled = false
+          }
+        })
+      }
+      if (name == '提交修改') {
+        this.$confirm("确认提交修改?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          synchronousPutBoxData(this.form).then(res => {
+            this.$message.success("操作成功");
+            this.fixData=true
+            this.getDetail(this.form.id)
+          })
+        })
+      }
       if (name == 'D费用一键保存') {
         if (!this.feeCenterListD.length) {
           return this.$message.error("请添加数据");