完善修改费用变更

src/api/warehouseBusiness/wareHouseModify.js

@@ -11,11 +11,8 @@ export function listWarehouseModify(query) {
 // 查询详情
 export function detailWarehouseModify(fId) {
   return request({
-    url: '/warehouse/modify',
+    url: '/warehouse/modify/' + fId,
     method: 'get',
-    params: {
-      fId: fId
-    }
   })
 }
 // 保存
@@ -34,3 +31,28 @@ export function checkWarehouseModify(data) {
     data: data
   })
 }
+// 撤销请核
+export function cancelRequest(data) {
+  return request({
+    url: '/warehouse/paths/revoke',
+    method: 'post',
+    data: data
+  })
+}
+// 查询
+export function passWarehouse(type, id) {
+  return request({
+    url: '/warehouse/modify/warehouseBill/' + id,
+    method: 'get',
+    params: {
+      type: type
+    }
+  })
+}
+// 查询
+export function deleteWarehouse(id) {
+  return request({
+    url: '/warehouse/modify/warehouseBill/ids=' + id,
+    method: 'delete',
+  })
+}

src/views/Warehousing/costModify/index.vue

@@ -9,9 +9,9 @@
     >
       <el-row>
         <el-col :span="6">
-          <el-form-item label-width="100px" label="系统编号" prop="mblno">
+          <el-form-item label-width="100px" label="系统编号" prop="fBillno">
             <el-input
-              v-model="queryParams.mblno"
+              v-model="queryParams.fBillno"
               placeholder="请输入系统编号"
               clearable
               size="small"
@@ -21,16 +21,18 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label-width="100px" label="制单日期" prop="mblno">
+          <el-form-item label-width="100px" label="制单日期" prop="createTime">
             <el-date-picker
               type="daterange"
               value-format="yyyy-MM-dd"
               clearable
+              unlink-panels
               style="width: 199px"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               @keyup.enter.native="handleQuery"
+              v-model="queryParams.createTime"
             >
             </el-date-picker>
           </el-form-item>
@@ -38,7 +40,7 @@
         <el-col :span="6">
           <el-form-item label-width="100px" label="制单人" prop="">
             <el-select
-              v-model="queryParams.corpId"
+              v-model="queryParams.createBy"
               placeholder="请输入制单人"
               clearable
               size="small"
@@ -54,9 +56,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label-width="100px" label="原业务类型" prop="billType">
+          <el-form-item label-width="100px" label="原业务类型" prop="fBilltype">
             <el-select
-              v-model="queryParams.billType"
+              v-model="queryParams.fBilltype"
               placeholder="请选择原业务类型"
               clearable
               size="small"
@@ -75,9 +77,9 @@
         <div v-show="show">
           <el-row>
             <el-col :span="6">
-              <el-form-item label="原客户名称" prop="corpId">
+              <el-form-item label="原客户名称" prop="fCorpid">
                 <el-select
-                  v-model="queryParams.corpId"
+                  v-model="queryParams.fCorpid"
                   placeholder="请输入原客户名称"
                   clearable
                   size="small"
@@ -92,17 +94,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label-width="100px" label="原系统编号" prop="">
-                <el-input
-                  placeholder="请输入原系统编号"
-                  clearable
-                  size="small"
-                  @keyup.enter.native="handleQuery"
-                  style="max-width: 199px"
-                />
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="6">-->
+<!--              <el-form-item label-width="100px" label="原系统编号" prop="">-->
+<!--                <el-input-->
+<!--                  placeholder="请输入原系统编号"-->
+<!--                  clearable-->
+<!--                  size="small"-->
+<!--                  @keyup.enter.native="handleQuery"-->
+<!--                  style="max-width: 199px"-->
+<!--                  v-model="queryParams.fBillno"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="6">
               <el-form-item label-width="100px" label="原提单号" prop="">
                 <el-input
@@ -111,6 +114,7 @@
                   size="small"
                   @keyup.enter.native="handleQuery"
                   style="max-width: 199px"
+                  v-model="queryParams.fMblno"
                 />
               </el-form-item>
             </el-col>
@@ -124,7 +128,9 @@
                   range-separator="至"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
+                  unlink-panels
                   @keyup.enter.native="handleQuery"
+                  v-model="queryParams.fBstime"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -134,36 +140,36 @@
       </el-collapse-transition>
     </el-form>
     <el-row :gutter="10" style="padding-bottom: 10px">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['fleet:plans:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['warehouseBusiness:inStock:edit']"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['warehouseBusiness:inStock:export']"
-        >导出
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['fleet:plans:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['warehouseBusiness:inStock:edit']"-->
+<!--        >修改-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['warehouseBusiness:inStock:export']"-->
+<!--        >导出-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <div class="tabSetting">
         <div style="margin-right: 20px">
           <el-button
@@ -171,6 +177,7 @@
             icon="el-icon-search"
             size="mini"
             @click="handleQuery"
+            v-hasPermi="['warehouse:modify:list']"
           >搜索</el-button
           >
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -279,6 +286,23 @@
         sortable
         :fixed="item.fixed"
       >
+        <template slot-scope="scope">
+          <span v-if="item.label == 'fCorpid'">
+            {{ scope.row.fCorpid | corpNameFormat(fMblnoOptions) }}
+          </span>
+          <span v-else-if="item.label == 'fGoodsid'">
+            {{ scope.row.fGoodsid | goodsFormat(goodsOptions) }}
+          </span>
+          <span v-else-if="item.label == 'fBilltype'">
+            {{ scope.row.fBilltype | billTypeFormat(billTypeList) }}
+          </span>
+          <span v-else-if="item.label == 'fWarehouseid'">
+            {{ scope.row.fWarehouseid | warehouseFormat(warehouseOptions) }}
+          </span>
+          <span v-else>
+            {{ scope.row[item.label] }}
+          </span>
+        </template>
       </el-table-column>
       <el-table-column
         label="操作"
@@ -293,6 +317,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-hasPermi="['warehouse:modify:query']"
           >查看</el-button
           >
           <!-- <el-button
@@ -304,14 +329,14 @@
             v-hasPermi="['fleet:plans:edit']"
             >修改</el-button
           > -->
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['fleet:plans:remove']"
-          >删除</el-button
-          >
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['fleet:plans:remove']"-->
+<!--          >删除</el-button-->
+<!--          >-->
         </template>
       </el-table-column>
     </el-table>
@@ -330,6 +355,15 @@
       :isDisabled="formDisabled"
       :addOrUpdateVisible="addOrUpdateVisible"
       @changeShow="showAddOrUpdate"
+      :form="form"
+      :feesList="feeList"
+      :formfeesList="formfeesList"
+      :goodsOptions="goodsOptions"
+      :warehouseOptions="warehouseOptions"
+      :fDc="fDc"
+      :warehouseId="warehouseId"
+      :disabledtwo="disabledtwo"
+      :approVal="approVal"
     ></add-or-update>
   </div>
 </template>
@@ -340,6 +374,13 @@ import { addSet, resetModule, select } from '@/api/system/set';
 import Cookies from 'js-cookie';
 import draggable from "vuedraggable";
 import AddOrUpdate from "./AddOrUpdate";
+import {listWarehouseModify,passWarehouse,detailWarehouseModify} from "@/api/warehouseBusiness/wareHouseModify";
+import {listGoods} from "@/api/basicdata/goods";
+import {
+  listWarehouse,
+  treeselect,
+  listWarehousesss,
+} from "@/api/basicdata/warehouse";
 
 export default {
   name: "costModify",
@@ -366,9 +407,7 @@ export default {
       // 遮罩层
       loading: false,
       // 主表格数据
-      costModifyList: [
-        {mdLoadDate: '1111222'}
-      ],
+      costModifyList: [],
       // 选中数组
       ids: [],
       // 非多个禁用
@@ -385,102 +424,111 @@ export default {
       tableDate: [
         {
           surface: "1",
-          label: "mdLoadDate",
+          label: "fBillno",
           name: "系统编号",
           checked: 0,
           width: 100,
         },
         {
           surface: "2",
-          label: "mdLoadDate",
+          label: "createTime",
           name: "制单日期",
           checked: 0,
           width: 100,
         },
         {
           surface: "3",
-          label: "mdLoadDate",
+          label: "createBy",
           name: "制单人",
           checked: 0,
           width: 100,
         },
         {
           surface: "4",
-          label: "mdLoadDate",
+          label: "fBilltype",
           name: "原业务类型",
           checked: 0,
           width: 150,
         },
         {
           surface: "5",
-          label: "mdLoadDate",
+          label: "fCorpid",
           name: "原客户",
           checked: 0,
           width: 100,
         },
-        {
-          surface: "6",
-          label: "mdLoadDate",
-          name: "原系统编号",
-          checked: 0,
-          width: 150,
-        },
+        // {
+        //   surface: "6",
+        //   label: "fBillno",
+        //   name: "原系统编号",
+        //   checked: 0,
+        //   width: 150,
+        // },
         {
           surface: "7",
-          label: "mdLoadDate",
+          label: "fMblno",
           name: "原提单号",
           checked: 0,
           width: 100,
         },
         {
           surface: "8",
-          label: "mdLoadDate",
+          label: "fBstime",
           name: "原业务日期",
           checked: 0,
           width: 150,
         },
         {
           surface: "9",
-          label: "mdLoadDate",
+          label: "fWarehouseid",
           name: "原仓库",
           checked: 0,
           width: 100,
         },
         {
           surface: "10",
-          label: "mdLoadDate",
+          label: "fGoodsid",
           name: "原品名",
           checked: 0,
           width: 100,
         },
-        {
-          surface: "11",
-          label: "mdLoadDate",
-          name: "最终审核人",
-          checked: 0,
-          width: 150,
-        },
-        {
-          surface: "12",
-          label: "mdLoadDate",
-          name: "最终审核日期",
-          checked: 0,
-          width: 180,
-        },
-        {
-          surface: "13",
-          label: "mdLoadDate",
-          name: "审批意见",
-          checked: 0,
-          width: 100,
-        },
+        // {
+        //   surface: "11",
+        //   label: "mdLoadDate",
+        //   name: "最终审核人",
+        //   checked: 0,
+        //   width: 150,
+        // },
+        // {
+        //   surface: "12",
+        //   label: "mdLoadDate",
+        //   name: "最终审核日期",
+        //   checked: 0,
+        //   width: 180,
+        // },
+        // {
+        //   surface: "13",
+        //   label: "mdLoadDate",
+        //   name: "审批意见",
+        //   checked: 0,
+        //   width: 100,
+        // },
       ],
       // 子组件弹窗title
       title: '',
       // 子组件弹窗显示开关
       addOrUpdateVisible: false,
       // 子组件表格是否禁用
-      formDisabled: true
+      formDisabled: true,
+      form: {},
+      feeList: [],
+      formfeesList: [],
+      goodsOptions: [],
+      warehouseOptions: [],
+      fDc: '',
+      warehouseId: null,
+      disabledtwo: false,
+      approVal: false,
     }
   },
   created() {
@@ -488,18 +536,48 @@ export default {
     this.getRowList = this.tableDate;
     this.getList();
     this.getDicts("data_billtype_type").then((response) => {
-      console.log(response)
       this.billTypeList = response.data;
     });
     listCorps().then((response) => {
       this.fMblnoOptions = response.rows;
     });
-    if (this.$route.query.id) {
+    listGoods({fStatus: 0, delFlag: 0}).then((response) => {
+      this.goodsOptions = response.rows;
+    });
+    listWarehousesss({fStatus: 0, delFlag: 0}).then((response) => {
+      this.warehouseOptions = response.rows;
+    });
+  },
+  activated() {
+    if (this.$route.query.data) {
       this.reset();
+      this.warehouseId = this.$route.query.data.form.fId
+      this.fDc = this.$route.query.data.fDc
+      this.disabledtwo = false
+      passWarehouse(this.fDc, this.warehouseId).then(res => {
+        this.form = res.data.data
+        this.feeList = res.data.data.tWarehousebillsfees
+      })
       this.$nextTick(() => {
         this.openDialog()
       })
-
+    }
+    if (this.$route.query.id) {
+      let id = this.$route.query.id;
+      console.log(id)
+      this.reset();
+      detailWarehouseModify(id).then(res => {
+        this.form = res.data
+        this.feeList = res.data.tWarehousebillsfees
+        this.formfeesList = res.data.warehousebillsfeesModifyList
+      })
+      this.disabledtwo = true
+      this.title = "查看订单";
+      this.addOrUpdateVisible = true;
+      this.form.id = id;
+      this.formDisabled = true
+      this.approVal = true
+      this.$router.push({query: {}});
     }
   },
   mounted() {
@@ -510,6 +588,44 @@ export default {
       }
     })
   },
+  filters: {
+    corpNameFormat(row, fMblnoOptions) {
+      let name;
+      fMblnoOptions.map((e) => {
+        if (row == e.fId) {
+          name = e.fName;
+        }
+      });
+      return name;
+    },
+    goodsFormat(row, goodsOptions) {
+      let name;
+      goodsOptions.map((e) => {
+        if (row == e.fId) {
+          name = e.fName;
+        }
+      });
+      return name;
+    },
+    billTypeFormat(row, billTypeList) {
+      let type;
+      billTypeList.map((e) => {
+        if (row == e.dictValue) {
+          type = e.dictLabel;
+        }
+      });
+      return type;
+    },
+    warehouseFormat(row, warehouseOptions) {
+      let name;
+      warehouseOptions.map((e) => {
+        if (row == e.fId) {
+          name = e.fName;
+        }
+      });
+      return name;
+    },
+  },
   methods: {
     openDialog(){
       this.formDisabled = true;
@@ -520,9 +636,14 @@ export default {
       this.addOrUpdateVisible = true;
     },
     getList() {
-      this.loading = false;
+      listWarehouseModify(this.queryParams).then(res => {
+        this.costModifyList = res.rows
+        this.total = res.total
+        this.loading = false;
+        console.log(this.costModifyList)
+      })
       // 根据浏览器高度设置初始高度
-      setInterval(() => {
+      setTimeout(() => {
         this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
       }, 300)
     },
@@ -604,12 +725,18 @@ export default {
       this.relevantAttachments = [];
       this.allfMblnoOptions = [];
       this.feesList = [];
+      this.formfeesList = [];
     },
     /** 查看按钮操作 */
     handleUpdate(row) {
-
-      let id = row.id;
+      let id = row.fId;
       this.reset();
+      detailWarehouseModify(id).then(res => {
+        this.form = res.data
+        this.feeList = res.data.tWarehousebillsfees
+        this.formfeesList = res.data.warehousebillsfeesModifyList
+      })
+      this.disabledtwo = true
       this.title = "查看订单";
       this.addOrUpdateVisible = true;
       this.form.id = id;
@@ -642,6 +769,11 @@ export default {
     showAddOrUpdate(data) {
       if (data === "false") {
         this.addOrUpdateVisible = false;
+        this.$router.push({
+          path: "/business/costModify",
+          query: {},
+        });
+        this.getList()
       } else {
         this.addOrUpdateVisible = true;
       }