修改耗材单据bug

2 years ago · fd00d0cdcc
parent 9ce0202fa3
commit fd00d0cdcc
4 changed files with 59 additions and 50 deletions
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@ -128,12 +128,8 @@
          <el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
          <el-table-column label="操作" width="150">
            <template slot-scope="scope">
-              <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
-                         @click.native="rowChange(scope.row)">编辑
-              </el-button>
-              <el-button type="text" size="small" @click.stop="true"
-                         @click.native="deleteCodeArray(scope.$index, scope.row)">删除
-              </el-button>
+              <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true" @click.native="rowChange(scope.row)">编辑</el-button>
+              <el-button type="text" size="small" @click.stop="true" @click.native="deleteCodeArray(scope.$index, scope.row)">删除</el-button>
            </template>
          </el-table-column>
        </el-table>
@ -161,7 +157,7 @@

 <script>
 import {getBusChange} from "@/api/basic/busTypeChange";
-import {inserThrOrderWeb, updateReceive, updateReceiveDetail, delReceiveDetail} from "@/api/thrsys/thrOrderReceive";
+import {inserThrOrderWeb, updateReceive, updateReceiveDetail,delReceiveDetail} from "@/api/thrsys/thrOrderReceive";
 import {filterSubByInv, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
 import dialogInvProduct from "../DialogSelectInvProduct";
 import {getOrderDetail} from "@/api/inout/receiveOrder";
@ -281,7 +277,7 @@ export default {
    //领用类型
    getBusType() {
      let query = {
-        enable: true,
+        enable: false,
        type: 1,
      };
      getBusChange(query)
@ -325,6 +321,7 @@ export default {
              }


+
            }
          }
          if (status === '0') {
@ -345,7 +342,7 @@ export default {
              type: "warning",
            }).then(() => {
              this.submitFunction(status);
-              this.loading = false
+              this.loading=false
            }).catch(() => {
              this.loading = false;
            });
@ -378,7 +375,7 @@ export default {
    },
    selectProductFunction(event) {

-      if (this.formData.targetInvCode == null) {
+      if(this.formData.targetInvCode==null){
        this.$message.error("往来信息为空！");
        return;
      }
@ -389,7 +386,7 @@ export default {
    },
    closeDialogC2(rData) {
      this.selectInvProductVisible = false;
-      this.formData.billNo = rData;
+      this.formData.billNo=rData;
      this.getOrderDetailList();

    },
@ -402,10 +399,10 @@ export default {
    },
    tableCountChange(row) {
      if (this.$isNotBlank(row)) {
-        updateReceiveDetail(row).then(res => {
-          if (res.code == 20000) {
+        updateReceiveDetail(row).then(res=>{
+           if (res.code==20000){
             this.loading = false;
-          } else {
+           }else{
             this.$message.error(res.message);
           }

@ -491,7 +488,7 @@ export default {
  },
  created() {
    if (this.$isNotBlank(this.idQuery.id)) {
-      this.editType = true;
+      this.editType=true;
      this.query.limit = 100;
      this.query.orderIdFk = this.idQuery.id;
      this.formData = this.idQuery.formData;
@ -500,7 +497,7 @@ export default {
      this.getOrderDetailList();
    } else {

-      this.editType = false;
+      this.editType=false;
      this.formData = {
        invCode: this.$store.getters.locInvCode,
        targetInvCode: null,
--- a/src/views/inout/receive/receiveAdd.vue
+++ b/src/views/inout/receive/receiveAdd.vue
@ -15,13 +15,13 @@
          </el-col>
          <el-col :span="6">
          <el-form-item label="领用类型:">
-            <el-select v-model="filterQuery.billAction" style="width: 90%"  placeholder="请选择领用类型" clearable="true">
+            <el-select v-model="filterQuery.billType" style="width: 90%"  placeholder="请选择领用类型" clearable="true">
              <el-option
                v-for="item in originTypes"
-                :key="item.name"
-                :label="item.name"
-                :value="item.action">
-                <span style="float: left;font-size: 13px">{{ item.name }}</span>
+                :key="item.originAction"
+                :label="item.originName"
+                :value="item.originAction">
+                <span style="float: left;font-size: 13px">{{ item.originName }}</span>
                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
                    item.thirdSysName
                  }}</span>
@ -63,14 +63,14 @@

      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" border @current-change="handleDetail">
        <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="领用类型" prop="billType"></el-table-column>
+        <el-table-column label="领用类型" prop="billTypeName"></el-table-column>
        <el-table-column label="单据号" prop="billNo"></el-table-column>
        <el-table-column label="领用仓库" prop="invName"></el-table-column>
        <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
        <el-table-column label="单据日期" prop="billDate"></el-table-column>
        <el-table-column label="状态" prop="status">
          <template slot-scope="scope">
-            <el-tag :type="(scope.row.status) | statusFilterType">
+            <el-tag :type="(scope.row.status)">
              {{ statusMap[scope.row.status] }}
            </el-tag>
          </template>
@ -130,6 +130,7 @@ import {filterDetailByKey} from "@/api/basic/basicThirdSys";
 import {selectIp} from "@/api/param/systemParamConfig";
 import thrOrderNew from "./DialogNewReceive";
 import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
+import {getBusChange} from "@/api/basic/busTypeChange";

 export default {
  data() {
@ -143,6 +144,8 @@ export default {
        type: 1,
        editStatus: 1,
        thirdPartyDate: 2,
+        startDate: null,
+        endDate: null,
      },
      formName: null,
      formMap: {
@ -236,11 +239,11 @@ export default {

    getList() {
      if (this.actDateRange != null) {
-        this.filterQuery.startDate = this.actDateRange[0];
-        this.filterQuery.endDate = this.actDateRange[1];
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
      } else {
-        this.filterQuery.startDate = null;
-        this.filterQuery.endDate = null;
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
      }

      getReceiveOrder(this.filterQuery)
@ -257,6 +260,7 @@ export default {
          this.total = 0;
        });
    },
+
    handleDetail(row) {
      var  query={};
      query.orderIdFk = row.billNo;
@ -308,7 +312,18 @@ export default {
      this.getList();
      this.detailList = [];
    },
-
+    getBusType() {
+      let query = {
+        enable: false,
+        type: 1,
+      };
+      getBusChange(query)
+        .then((response) => {
+          this.originTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
    newDistributionForm(index, row) {
      this.idQuery.id = '';
      if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
@ -327,11 +342,8 @@ export default {
  mounted() {
  },
  created() {
-    let end = new Date();
-    let start = new Date();
-    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-    this.actDateRange = [start, end];
    this.getList();
+    this.getBusType();
  },
 };
 </script>
--- a/src/views/inout/receive/receiveAudit.vue
+++ b/src/views/inout/receive/receiveAudit.vue
@ -196,7 +196,7 @@ export default {
        page: 1,
        limit: 10,
        corpName: null,
-        type: 1,
+        type: 2,
        editStatus: 2,
      };
      this.actDateRange = [];
--- a/src/views/inout/receive/receiveSearch.vue
+++ b/src/views/inout/receive/receiveSearch.vue
@ -197,7 +197,7 @@ export default {
        page: 1,
        limit: 10,
        corpName: null,
-        type: 1,
+        type: 3,
        editStatus: 2,
      };
      this.actDateRange = [];