提交箱管

src/api/boxManagement/boxRepair/index.js

@@ -17,19 +17,11 @@ export const remove = (ids) => {
         }
     })
 }
-//查询轨迹
-export const archivestrajectory = (params) => {
-    return request({
-        url: '/api/blade-box-tube/archivestrajectory/list',
-        method: 'get',
-        params: params
-    })
-}
 
 //查询明细
 export const detail = (params) => {
     return request({
-        url: '/api/blade-box-tube/transport/detail',
+        url: '/api/blade-box-tube/repair/detail',
         method: 'get',
         params: params
     })
@@ -37,15 +29,7 @@ export const detail = (params) => {
 //新增修改
 export function submit(data){
     return request({
-        url:'/api/blade-box-tube/transport/submit',
-        method:'post',
-        data
-    })
-}
-//修改轨迹
-export function update(data){
-    return request({
-        url:'/api/blade-box-tube/archivestrajectory/update',
+        url:'/api/blade-box-tube/repair/submit',
         method:'post',
         data
     })
@@ -54,17 +38,18 @@ export function update(data){
 //删除明细
 export const tradingBoxItem = (ids) => {
     return request({
-        url: '/api/blade-box-tube/transportItem/remove',
+        url: '/api/blade-box-tube/repairItem/remove',
         method: 'post',
         params: {
             ids,
         }
     })
 }
-//删除轨迹
-export const tradingBoxGJ = (ids) => {
+
+//删除费用明细
+export const tradingBoxFees = (ids) => {
     return request({
-        url: '/api/blade-box-tube/archivestrajectory/remove',
+        url: '/api/blade-box-tube/repairFees/remove',
         method: 'post',
         params: {
             ids,
@@ -72,10 +57,10 @@ export const tradingBoxGJ = (ids) => {
     })
 }
 
-//删除费用明细
-export const tradingBoxFees = (ids) => {
+//删除附件图片
+export const tradingBoxFiles = (ids) => {
     return request({
-        url: '/api/blade-box-tube/transportItemFees/remove',
+        url: '/api/blade-box-tube/files/remove',
         method: 'post',
         params: {
             ids,
@@ -86,7 +71,7 @@ export const tradingBoxFees = (ids) => {
 // 请核
 export function pleaseCheck(data) {
     return request({
-        url: '/api/blade-box-tube/transport/checkTransport',
+        url: '/api/blade-box-tube/repair/checkRepair',
         method: 'post',
         data: data
     })
@@ -94,16 +79,8 @@ export function pleaseCheck(data) {
 // 撤销
 export function repealCancel(data) {
     return request({
-        url: '/api/blade-box-tube/transport/withdrawTransport',
+        url: '/api/blade-box-tube/repair/withdrawRepair',
         method: 'post',
         data: data
     })
 }
-// 更改状态
-export function statusUpdate(data) {
-    return request({
-        url: '/api/blade-box-tube/transport/statusUpdate',
-        method: 'get',
-        params:data
-    })
-}

src/api/boxManagement/exportShipment/index.js

@@ -29,7 +29,7 @@ export const remove = (ids) => {
 //查询明细
 export const detail = (params) => {
     return request({
-        url: '/api/blade-box-tube/repair/detail',
+        url: '/api/blade-box-tube/transport/detail',
         method: 'get',
         params: params
     })
@@ -37,7 +37,15 @@ export const detail = (params) => {
 //新增修改
 export function submit(data){
     return request({
-        url:'/api/blade-box-tube/repair/submit',
+        url:'/api/blade-box-tube/transport/submit',
+        method:'post',
+        data
+    })
+}
+//修改轨迹
+export function update(data){
+    return request({
+        url:'/api/blade-box-tube/archivestrajectory/update',
         method:'post',
         data
     })
@@ -46,28 +54,28 @@ export function submit(data){
 //删除明细
 export const tradingBoxItem = (ids) => {
     return request({
-        url: '/api/blade-box-tube/repairItem/remove',
+        url: '/api/blade-box-tube/transportItem/remove',
         method: 'post',
         params: {
             ids,
         }
     })
 }
-
-//删除图片
-export const tradingBoxFiles = (ids) => {
+//删除轨迹
+export const tradingBoxGJ = (ids) => {
     return request({
-        url: '/api/blade-box-tube/files/remove',
+        url: '/api/blade-box-tube/archivestrajectory/remove',
         method: 'post',
         params: {
             ids,
         }
     })
 }
+
 //删除费用明细
 export const tradingBoxFees = (ids) => {
     return request({
-        url: '/api/blade-box-tube/repairFees/remove',
+        url: '/api/blade-box-tube/transportItemFees/remove',
         method: 'post',
         params: {
             ids,
@@ -78,7 +86,7 @@ export const tradingBoxFees = (ids) => {
 // 请核
 export function pleaseCheck(data) {
     return request({
-        url: '/api/blade-box-tube/repair/checkRepair',
+        url: '/api/blade-box-tube/transport/checkTransport',
         method: 'post',
         data: data
     })
@@ -86,8 +94,16 @@ export function pleaseCheck(data) {
 // 撤销
 export function repealCancel(data) {
     return request({
-        url: '/api/blade-box-tube/repair/withdrawRepair',
+        url: '/api/blade-box-tube/transport/withdrawTransport',
         method: 'post',
         data: data
     })
 }
+// 更改状态
+export function statusUpdate(data) {
+    return request({
+        url: '/api/blade-box-tube/transport/statusUpdate',
+        method: 'get',
+        params:data
+    })
+}

src/components/boxCost/index.vue

@@ -275,7 +275,6 @@ export default {
       }
     },
     rowUpdate(form, index, done, loading) {
-      console.log(form)
       done(form)
       if (this.activeName === "first") {
         this.$emit("callBack", this.dataList.concat(this.data_two));

src/views/boxManagement/boxRepair/detailsPage.vue

@@ -91,7 +91,7 @@
       </avue-crud>
     </trade-card>
     <!--    费用信息组件-->
-    <box-cost :listData="dataListTwo" :codeValue="242.2" :tabShow="3" activeName="second" ref="boxCost"
+    <box-cost v-model="dataListTwo" :codeValue="242.2" :tabShow="3" activeName="second" ref="boxCost"
               url="/api/blade-box-tube/files/remove" @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
       <c-upload
@@ -132,7 +132,7 @@ import {
   pleaseCheck,
   repealCancel,
   tradingBoxFiles
-} from "@/api/boxManagement/exportShipment/index.js";
+} from "@/api/boxManagement/boxRepair/index.js";
 
 import checkSchedule from "@/components/check/checkSchedule";
 import {selectByName} from "@/api/boxManagement";

src/views/boxManagement/boxRepair/index.vue

@@ -8,6 +8,7 @@
           :table-loading="loading"
           :data="dataList"
           ref="crud"
+          :key="key"
           @on-load="onLoad"
           @search-change="searchChange"
           @row-del="rowDel"
@@ -108,8 +109,22 @@ export default {
           label: '备注',
           prop: 'remarks',
           overHidden: true
+        }, {
+          label: '状态',
+          prop: 'status',
+          width: 140,
+          overHidden: true,
+          filterable: true,
+          type: 'select',
+          dataType: 'number',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=approval_status",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          }
         }]
-      }
+      },
+      key:0
     }
   },
   activated() {
@@ -128,6 +143,7 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(242), this.optionList);
+    this.key++
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++

src/views/boxManagement/boxWashing/detailsPage.vue

@@ -91,7 +91,7 @@
       </avue-crud>
     </trade-card>
     <!--    费用信息组件-->
-    <box-cost :listData="dataListTwo" :codeValue="243.2" :tabShow="3" activeName="second" ref="boxCost"
+    <box-cost v-model="dataListTwo" :codeValue="243.2" :tabShow="3" activeName="second" ref="boxCost"
               url="/api/blade-box-tube/files/remove" @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
       <c-upload
@@ -132,7 +132,7 @@ import {
   pleaseCheck,
   repealCancel,
   tradingBoxFiles
-} from "@/api/boxManagement/exportShipment/index.js";
+} from "@/api/boxManagement/boxRepair/index.js";
 
 import checkSchedule from "@/components/check/checkSchedule";
 import {selectByName} from "@/api/boxManagement";

src/views/boxManagement/boxWashing/index.vue

@@ -8,6 +8,7 @@
           :table-loading="loading"
           :data="dataList"
           ref="crud"
+          :key="key"
           @on-load="onLoad"
           @search-change="searchChange"
           @row-del="rowDel"
@@ -108,8 +109,22 @@ export default {
           label: '备注',
           prop: 'remarks',
           overHidden: true
+        }, {
+          label: '状态',
+          prop: 'status',
+          width: 140,
+          overHidden: true,
+          filterable: true,
+          type: 'select',
+          dataType: 'number',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=approval_status",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          }
         }]
-      }
+      },
+      key:0
     }
   },
   activated() {
@@ -128,6 +143,7 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(243), this.optionList);
+    this.key++
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++

src/views/boxManagement/exportShipment/detailsPage.vue

@@ -111,7 +111,7 @@
       </avue-crud>
     </trade-card>
     <!--    费用信息组件-->
-    <box-cost :listData="dataListTwo" :codeValue="237.2" activeName="first" ref="boxCost"
+    <box-cost v-model="dataListTwo" :codeValue="237.2" activeName="first" ref="boxCost"
               url="/api/blade-box-tube/transportItemFees/remove" @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
       <c-upload
@@ -368,6 +368,9 @@ export default {
           label: '系统号',
           prop: 'sysNo',
           disabled: true
+        },{
+          label: '合同号',
+          prop: 'contractNo'
         }, {
           label: '客户',
           prop: 'corpId',
@@ -513,8 +516,8 @@ export default {
           label: '备注',
           prop: 'remarks',
           type: 'textarea',
-          minRows: 3,
-          span: 24
+          minRows: 1,
+          span: 18
         }]
       },
       option: {},

src/views/boxManagement/exportShipment/index.vue

@@ -8,6 +8,7 @@
           :table-loading="loading"
           :data="dataList"
           ref="crud"
+          :key="key"
           @on-load="onLoad"
           @search-change="searchChange"
           @row-del="rowDel"
@@ -94,6 +95,13 @@ export default {
           label: '系统号',
           prop: 'sysNo',
           width: 100,
+          search: true,
+          overHidden: true
+        },{
+          label: '合同号',
+          prop: 'contractNo',
+          width: 100,
+          search: true,
           overHidden: true
         }, {
           label: '客户',
@@ -199,8 +207,22 @@ export default {
           prop: 'remarks',
           width: 100,
           overHidden: true
+        }, {
+          label: '状态',
+          prop: 'status',
+          width: 140,
+          overHidden: true,
+          filterable: true,
+          type: 'select',
+          dataType: 'number',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=approval_status",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          }
         }]
-      }
+      },
+      key:0
     }
   },
   activated() {
@@ -219,6 +241,7 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(237), this.optionList);
+    this.key++
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++

src/views/boxManagement/importReturnTrip/detailsPage.vue

@@ -110,7 +110,7 @@
       </avue-crud>
     </trade-card>
     <!--    费用信息组件-->
-    <box-cost :listData="dataListTwo" :codeValue="237.2" activeName="second" ref="boxCost"
+    <box-cost v-model="dataListTwo" :codeValue="237.2" activeName="second" ref="boxCost"
               url="/api/blade-box-tube/transportItemFees/remove" @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
       <c-upload
@@ -367,6 +367,9 @@ export default {
           label: '系统号',
           prop: 'sysNo',
           disabled: true
+        },{
+          label: '合同号',
+          prop: 'contractNo'
         }, {
           label: '客户',
           prop: 'corpId',
@@ -517,8 +520,8 @@ export default {
           label: '备注',
           prop: 'remarks',
           type: 'textarea',
-          minRows: 3,
-          span: 24
+          minRows: 1,
+          span: 18
         }]
       },
       option: {},

src/views/boxManagement/importReturnTrip/index.vue

@@ -8,6 +8,7 @@
           :table-loading="loading"
           :data="dataList"
           ref="crud"
+          :key="key"
           @on-load="onLoad"
           @search-change="searchChange"
           @row-del="rowDel"
@@ -94,6 +95,13 @@ export default {
           label: '系统号',
           prop: 'sysNo',
           width: 100,
+          search: true,
+          overHidden: true
+        },{
+          label: '合同号',
+          prop: 'contractNo',
+          width: 100,
+          search: true,
           overHidden: true
         }, {
           label: '客户',
@@ -199,8 +207,22 @@ export default {
           prop: 'remarks',
           width: 100,
           overHidden: true
+        }, {
+          label: '状态',
+          prop: 'status',
+          width: 140,
+          overHidden: true,
+          filterable: true,
+          type: 'select',
+          dataType: 'number',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=approval_status",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          }
         }]
-      }
+      },
+      key:0
     }
   },
   activated() {
@@ -219,6 +241,7 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(237), this.optionList);
+    this.key++
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++