Browse Source

修改bug

qukaidi 2 years ago
parent
commit
7b91ac936a

+ 9 - 5
src/views/InventoryManagement/inventory/detailsPage.vue

@@ -21,7 +21,8 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item :disabled="form.status>0" @click.native="auditCheck">审核数据</el-dropdown-item>
-            <el-dropdown-item v-if="roleName=='admin'" :disabled="form.status<1" @click.native="revokeCheck">撤销审核</el-dropdown-item>
+            <el-dropdown-item v-if="roleName=='admin'" :disabled="form.status<1" @click.native="revokeCheck">撤销审核
+            </el-dropdown-item>
             <el-dropdown-item :disabled="form.status<1" @click.native="checkScheduleDialog = true">审核进度
             </el-dropdown-item>
             <el-dropdown-item v-if="$route.query.check" :disabled="form.status==3" @click.native="check">审批数据
@@ -58,7 +59,7 @@
             <div style="display:flex;justify-content: center;">
               <el-button size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)"
                 :disabled="disabled || detailData.status == 1">{{ row.$cellEdit ? "保存" : "修改" }}</el-button>
-                <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
+              <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
                 :disabled="detailData.status == 1">删除</el-button>
             </div>
           </template>
@@ -93,7 +94,7 @@
 </template>
 
 <script>
-import { detail, submit, checkWarehousing, getStoragetree, getStorage, getAllgoods, revokeWarehousing,delItem } from "@/api/purchasingManagement/inStock";
+import { detail, submit, checkWarehousing, getStoragetree, getStorage, getAllgoods, revokeWarehousing, delItem } from "@/api/purchasingManagement/inStock";
 import tableOption from "./config/customerContact.json";
 import feeInfo from "@/components/fee-info/main";
 import checkSchedule from "../../../components/check/checkSchedule";
@@ -177,7 +178,7 @@ export default {
       pageLoading: false,
       batchNo: '',
       storagetreeList: [],
-      roleName:localStorage.getItem("roleName")
+      roleName: localStorage.getItem("roleName")
     };
   },
   props: {
@@ -362,7 +363,7 @@ export default {
             delete e.id
           })
           this.form = res.data.data;
-          this.itemsVOList = res.data.data.itemsVOList;
+          this.itemsVOList = res.data.data.itemsVOList.filter(item => item.isIssue == 1);
           this.getStorage()
         })
         .finally(() => {
@@ -374,6 +375,9 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
+          this.itemsVOList.forEach((e, index) => {
+            e.sort = Number(index) + 1
+          })
           this.subLoading = true;
           let data = {
             ...this.form,

+ 7 - 3
src/views/purchasingManagement/inStock/detailsPage.vue

@@ -21,7 +21,8 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item :disabled="form.status>0" @click.native="auditCheck">提交审核</el-dropdown-item>
-            <el-dropdown-item v-if="roleName=='admin'" :disabled="form.status<1" @click.native="revokeCheck">撤销审核</el-dropdown-item>
+            <el-dropdown-item v-if="roleName=='admin'" :disabled="form.status<1" @click.native="revokeCheck">撤销审核
+            </el-dropdown-item>
             <el-dropdown-item :disabled="form.status<1" @click.native="checkScheduleDialog = true">审核进度
             </el-dropdown-item>
             <el-dropdown-item v-if="$route.query.check" :disabled="form.status==3" @click.native="check">审批数据
@@ -66,7 +67,7 @@
               @click.stop="addRow">录入明细
             </el-button>
             <!--            <el-button type="success" icon="el-icon-bottom" size="small" @click.stop="getTemplate">下载模板</el-button>-->
-            <el-button type="info" icon="el-icon-top" size="small" :disabled="detailData.status == 1"
+            <el-button type="info" icon="el-icon-top" size="small" :disabled="detailData.status == 1||!form.id"
               @click.stop="excelBox = true">导入
             </el-button>
           </template>
@@ -312,7 +313,7 @@ export default {
       olditemsVOList: [],
       oldorderFeesList: [],
       oldorderFilesList: [],
-      roleName:localStorage.getItem("roleName")
+      roleName: localStorage.getItem("roleName")
     };
   },
   props: {
@@ -494,6 +495,9 @@ export default {
               return this.$message.error('请保存明细')
             }
           }
+          this.itemsVOList.forEach((e, index) => {
+            e.sort = Number(index) + 1
+          })
           let orderFeesList = this.$refs.feeInfo.submitData();
           this.subLoading = true;
           let data = {

+ 3 - 0
src/views/salesManagement/outStock/detailsPage.vue

@@ -481,6 +481,9 @@ export default {
               return this.$message.error('请保存明细')
             }
           }
+          this.itemsVOList.forEach((e, index) => {
+            e.sort = Number(index) + 1
+          })
           let orderFeesList = this.$refs.feeInfo.submitData();
           this.subLoading = true;
           let data = {