瀏覽代碼

修复部分禅道提出的问题

caojunjie 4 年之前
父節點
當前提交
74057087cb

+ 5 - 5
src/views/basicdata/warehouse/index.vue

@@ -235,25 +235,25 @@
           <el-table-column type="index" label="序号" align="center"/>
 
           <el-table-column label="库区编号" align="center" prop="fNo" >
-            <template scope="scope">
+            <template slot-scope="scope">
               <el-input v-model="scope.row.fNo"  placeholder="库区编号" />
             </template>
           </el-table-column>
 
           <el-table-column label="库区名称" align="center" prop="fName" >
-            <template scope="scope">
+            <template slot-scope="scope">
               <el-input v-model="scope.row.fName"  placeholder="库区名称" />
             </template>
           </el-table-column>
 
           <el-table-column label="库区地址" align="center" prop="fAddr" >
-            <template scope="scope">
+            <template slot-scope="scope">
               <el-input v-model="scope.row.fAddr"  placeholder="库区地址" />
             </template>
           </el-table-column>
 
           <el-table-column label="备注" align="center" prop="remark" >
-            <template scope="scope">
+            <template slot-scope="scope">
               <el-input v-model="scope.row.remark"  placeholder="备注" />
             </template>
           </el-table-column>
@@ -281,7 +281,7 @@
 </template>
 
 <script>
-import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse,changeWareStatus, exportWarehouse,delCusCon } from "../../../api/basicdata/warehouse";
+import { listWarehouse, getWarehouse, delWarehouse, addWarehouse,changeWareStatus, exportWarehouse,delCusCon } from "@/api/basicdata/warehouse";
 
 export default {
   name: "Warehouse",

+ 3 - 1
src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -1776,7 +1776,9 @@
         // 日期区间
         orgStorageDate: null,
         // 表单参数
-        form: {},
+        form: {
+          fFeetunit:2
+        },
         // 库存总账参数
         whgenlegParams: {
           pageNum: 1,

+ 15 - 3
src/views/warehouseBusiness/inStock/index.vue

@@ -903,7 +903,7 @@
           <el-select
             v-model="form.fBusinessType"
             filterable
-            :disabled="browseStatus"
+            :disabled="contrOl"
           >
             <el-option
               v-for="(dict, index) in businessTypeOption"
@@ -1368,7 +1368,7 @@
               "
               @click.native.prevent="wDeleteRow(scope.$index, dataList)"
               size="small"
-            >移除</el-button
+            >移1除</el-button
             >
           </template>
         </el-table-column>
@@ -2734,6 +2734,7 @@ export default {
       doNot:false,
       // 修改查看状态
       browseStatus: false,
+      contrOl:false,
       // 审批状态控制
       approvalStatus: false,
       detailsHidden: false,
@@ -2962,7 +2963,8 @@ export default {
       // 表单参数
       form: {
         fBusinessType: '常规入账',
-        fItemsStatus: null
+        fItemsStatus: null,
+        fFeetunit: '2'
       },
       // 表单校验
       rules: {
@@ -3576,6 +3578,7 @@ export default {
         fBillstatus: 10,
       });
       this.weightList = false;
+      this.contrOl = true
     },
     // 导入付款信息
     whgenlegData() {
@@ -3829,6 +3832,11 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(status) {
+      this.form = {
+        fBusinessType: '常规入账',
+          fItemsStatus: null,
+          fFeetunit: '2'
+      }
       this.browseStatus = status;
       this.queryUser();
       this.goodsRemoteMethod()
@@ -3845,6 +3853,9 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row, status) {
       this.reset();
+      if (this.dataList.length === 0){
+        this.contrOl = true
+      }
       this.browseStatus = status;
       this.detailsHidden = false;
       this.formBrowseStatus = false;
@@ -4450,6 +4461,7 @@ export default {
       rows.splice(index, 1)
       if (this.dataList.length === 0) {
         this.formBrowseStatus = false
+        this.contrOl = false
         return false
       }
       let sum = 0

+ 9 - 3
src/views/warehouseBusiness/outStock/index.vue

@@ -775,7 +775,7 @@
           <el-select
             v-model="form.fBusinessType"
             filterable
-            :disabled="browseStatus"
+            :disabled="contrOl"
           >
             <el-option
               v-for="(dict, index) in businessTypeOption"
@@ -2535,6 +2535,7 @@ export default {
       warehouseDrList: [],
       printinglist: [],
       browseStatus: false,
+      contrOl:false,
       relevantAttachments: [],
       // 非单个禁用
       single: true,
@@ -2669,7 +2670,7 @@ export default {
         fCorpid: null,
         fTrademodeid: null,
         fWarehouseid: null,
-        fBusinessType: '出库装箱'
+        fBusinessType: '出库装箱',
       },
       // 表单校验
       rules: {
@@ -3144,7 +3145,6 @@ export default {
     },
     // 库存总账导出数据
     whgenlegData() {
-
       if (this.dialogWhgenlegList.length === 0) {
         this.$message({ message: "未勾选信息", type: "warning" });
         return false;
@@ -3197,6 +3197,7 @@ export default {
         });
       }
       this.whgenlegVisible = false;
+      this.contrOl = true
     },
     // 收货单打印界面
     showEditDialog_s() {
@@ -3538,10 +3539,14 @@ export default {
       this.relevantAttachments = [];
       this.title = "出库单";
       this.formBrowseStatus = false;
+      this.form.fFeetunit = 2
     },
     /** 修改按钮操作 */
     handleUpdate(row, status) {
       this.reset();
+      if (this.dataList.length === 0){
+        this.contrOl = true
+      }
       this.browseStatus = status;
       this.detailsHidden = false;
       this.formBrowseStatus = false;
@@ -4251,6 +4256,7 @@ export default {
       rows.splice(index, 1);
       if (this.dataList.length === 0) {
         this.formBrowseStatus = false
+        this.contrOl = false
         return false
       }
       for (let li in this.dataList) {