仓储费计算增加仓库

src/views/warehouseBusiness/agreement/index.vue

@@ -292,12 +292,23 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="仓库" prop="fWarehouseid" v-if="showWarehouse == '0'">
+          <el-select v-model="form.fWarehouseid" :disabled="notChange" placeholder="请选择仓库库区" multiple>
+            <el-option
+              v-for="(item, index) in warehouseOptions"
+              :key="index.fId"
+              :label="item.fName"
+              :value="item.fId"
+              style="width: 210px;"
+            ></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <el-button type="primary" @click="submit" :disabled="notChange">请 核</el-button>
 
       <div class="dialogTableTitle flex a-center jlr">
-        <h2>标题</h2>
-        <el-button @click="getList_s()" :disabled="notChange">新增</el-button>
+        <h2>收款</h2>
+        <el-button @click="getList_s('C')" :disabled="notChange">新增</el-button>
       </div>
       <el-table v-loading="loading_s" :data="agreementitemsList" @selection-change="handleSelectionChange">
         <!--        <el-table-column type="selection" width="55" align="center"/>-->
@@ -422,6 +433,134 @@
         </el-table-column>
       </el-table>
 
+<!--      付款-->
+<!--      <div class="dialogTableTitle flex a-center jlr">-->
+<!--        <h2>付款</h2>-->
+<!--        <el-button @click="getList_s('D')" :disabled="notChange">新增</el-button>-->
+<!--      </div>-->
+<!--      <el-table v-loading="loading_f" :data="agreementitemsListD" @selection-change="handleSelectionChange">-->
+<!--        &lt;!&ndash;        <el-table-column type="selection" width="55" align="center"/>&ndash;&gt;-->
+<!--        <el-table-column label="行号" align="center" type="index"/>-->
+
+<!--        <el-table-column-->
+<!--          prop="fFeeunitid"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          width="180px"-->
+<!--          label="计价单位"-->
+<!--        >-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-select-->
+<!--              v-model="scope.row.fFeeunitid"-->
+<!--              placeholder="请选择计价单位"-->
+<!--              @change="changeFeeUnit(scope.row)"-->
+<!--              clearable-->
+<!--              :disabled="browseStatus"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="(dict, index) in jFeetunitOptions"-->
+<!--                :key="index.dictValue"-->
+<!--                :label="dict.dictLabel"-->
+<!--                :value="dict.dictValue"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="开始天数" align="center">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-input-->
+<!--              v-model="scope.row.fFromdays"-->
+<!--              placeholder="请输入开始天数"-->
+<!--              oninput='value = value.replace(/[^\d.]/g,"")'-->
+<!--              clearable-->
+<!--              size="small"-->
+<!--              :disabled="notChange"-->
+<!--            />-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="结束天数" align="center">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-input-->
+<!--              v-model="scope.row.fEndays"-->
+<!--              placeholder="请输入结束天数"-->
+<!--              oninput='value = value.replace(/[^\d.]/g,"")'-->
+<!--              clearable-->
+<!--              size="small"-->
+<!--              :disabled="notChange"-->
+<!--            />-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="单价" align="center">-->
+<!--          <el-input-->
+<!--            slot-scope="scope"-->
+<!--            v-model="scope.row.fPrice"-->
+<!--            placeholder="请输入单价"-->
+<!--            oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
+<!--            clearable-->
+<!--            size="small"-->
+<!--            :disabled="notChange"-->
+<!--          />-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="录入人" align="center">-->
+<!--          <el-input-->
+<!--            slot-scope="scope"-->
+<!--            v-model="scope.row.createBy"-->
+<!--            :disabled="true"-->
+<!--            placeholder="默认录入人"-->
+<!--            clearable-->
+<!--            size="small"-->
+<!--          />-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="录入时间" align="center">-->
+<!--          <el-input-->
+<!--            slot-scope="scope"-->
+<!--            v-model="scope.row.createTime"-->
+<!--            placeholder="默认录入时间"-->
+<!--            :disabled="true"-->
+<!--            clearable-->
+<!--            size="small"-->
+<!--          />-->
+<!--        </el-table-column>-->
+
+<!--        <el-table-column-->
+<!--          prop="fFeeid"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          width="180px"-->
+<!--          label="费用名称"-->
+<!--        >-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-select-->
+<!--              v-model="scope.row.fFeeid"-->
+<!--              filterable-->
+<!--              remote-->
+<!--              :disabled="browseStatus"-->
+<!--              :remote-method="fWRemoteMethod"-->
+<!--              placeholder="费用名称"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="(dict, index) in fWbuOptions"-->
+<!--                :key="index.fId"-->
+<!--                :label="dict.fName"-->
+<!--                :value="dict.fId"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              icon="el-icon-delete"-->
+<!--              :disabled="browseStatus"-->
+<!--              @click.native.prevent="deleteRow(scope.$index, agreementitemsListD)"-->
+<!--            >删除-->
+<!--            </el-button>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--      </el-table>-->
+
 <!--      <div class="dialogTableTitle flex a-center jlr">-->
 <!--        <h2>附件明细</h2>-->
 <!--        <el-button @click="addRelevt()" :disabled="notChange">新增</el-button>-->
@@ -569,6 +708,9 @@ import Global from '@/layout/components/global'
 import Vue from 'vue'
 // import { listUser, queryUserVal } from '@/api/system/user'
 import { getToken } from "@/utils/auth";
+import {
+  listWarehousesss,
+} from "@/api/basicdata/warehouse";
 Vue.directive('dialogDrag', {
   bind(el, binding, vnode, oldVnode) {
     const dialogHeaderEl = el.querySelector('.el-dialog__header')
@@ -647,6 +789,7 @@ export default {
       // 遮罩层
       loading: true,
       loading_s: false,
+      loading_f: false,
       browseStatus: false,
       // 计价单位
       jFeetunitOptions: [],
@@ -670,6 +813,9 @@ export default {
       total: 0,
       // 仓储费表格数据
       agreementList: [],
+      // 仓库
+      warehouseOptions: [],
+      showWarehouse: null,
       // 弹出层标题
       title: '',
       add: '',
@@ -681,8 +827,10 @@ export default {
       tPackagesOptions: [],
       // 贸易方式,对应t_trademodels 字典
       fTrademodeidOptions: [],
-      // 仓储费明细表表格数据
+      // 仓储费收款明细表表格数据
       agreementitemsList: [],
+      //仓储费付款明细表表格数据
+      agreementitemsListD: [],
       // 操作人
       operator: '',
       lander: '',
@@ -743,6 +891,9 @@ export default {
     listCorps().then(response => {
       this.fMblnoOptions = response.rows
     })
+    listWarehousesss({fStatus: 0, delFlag: 0}).then((response) => {
+      this.warehouseOptions = response.rows;
+    });
     this.getDicts('data_settlement_method').then(response => {
       this.fStltypeidOptions = response.data
     })
@@ -758,6 +909,9 @@ export default {
     this.getDicts("data_unitfees").then(response => {
       this.jFeetunitOptions = response.data;
     });
+    this.getConfigKey("agreement.warehouse").then((response) => {
+      this.showWarehouse = response.msg;
+    });
     this.register()
   },
   activated(){
@@ -882,10 +1036,15 @@ export default {
         this.deptName = response.data.dept.deptName
         this.form = response.data.tWarehouseAgreement
         if (response.data.tWarehouseAgreement.tPackages) {
-          this.form.tPackages = this.form.tPackages
-            .replace(/\[|]/g, "")
-            .replace(/\"/g, "")
-            .split(",");
+          // this.form.tPackages = this.form.tPackages
+          //   .replace(/\[|]/g, "")
+          //   .replace(/\"/g, "")
+          //   .split(",");
+          this.form.tPackages = JSON.parse(this.form.tPackages)
+        }
+        if (response.data.tWarehouseAgreement.fWarehouseid) {
+          // this.form.fWarehouseid = this.form.fWarehouseid.replace(/\[|]/g, "").split(",");
+          this.form.fWarehouseid = JSON.parse(this.form.fWarehouseid)
         }
         this.operator = this.form.createBy
         this.agreementitemsList = response.data.tWarehouseAgreementitems
@@ -1008,26 +1167,48 @@ export default {
       }
     },
     /** 创建仓储费明细表列表 */
-    getList_s() {
+    getList_s(payment) {
       queryUserVal().then((response) => {
-        this.agreementitemsList.push({
-          //行号
-          fLineno: '',
-          //计价单位
-          fFeeunitid: '',
-          //费用名称
-          fFeeid: '',
-          //开始天数
-          fFromdays: '',
-          //结束天数
-          fEndays: '',
-          //单价
-          fPrice: '',
-          //录入人
-          createBy: response.user.userName,
-          //创建时间
-          createTime: moment(Date.parse(new Date())).format('YYYY-MM-DD HH:mm:ss')
-        })
+        if (payment === 'C') {
+          this.agreementitemsList.push({
+            //行号
+            fLineno: '',
+            //计价单位
+            fFeeunitid: '',
+            //费用名称
+            fFeeid: '',
+            //开始天数
+            fFromdays: '',
+            //结束天数
+            fEndays: '',
+            //单价
+            fPrice: '',
+            //录入人
+            createBy: response.user.userName,
+            //创建时间
+            createTime: moment(Date.parse(new Date())).format('YYYY-MM-DD HH:mm:ss')
+          })
+        } else {
+          this.agreementitemsListD.push({
+            //行号
+            fLineno: '',
+            //计价单位
+            fFeeunitid: '',
+            //费用名称
+            fFeeid: '',
+            //开始天数
+            fFromdays: '',
+            //结束天数
+            fEndays: '',
+            //单价
+            fPrice: '',
+            //录入人
+            createBy: response.user.userName,
+            //创建时间
+            createTime: moment(Date.parse(new Date())).format('YYYY-MM-DD HH:mm:ss')
+          })
+        }
+
         // this.$set("deptName", response.dept.deptName);
         this.deptName = response.dept.deptName
         this.form.fDeptid = response.dept.deptId
@@ -1165,6 +1346,7 @@ export default {
     handleAdd() {
       this.form = {}
       this.agreementitemsList = []
+      this.agreementitemsListD = []
       this.reset()
       // this.agreementitemsList = {
       //   fFeeunitid:'',
@@ -1202,6 +1384,9 @@ export default {
               .replace(/\"/g, "")
               .split(",");
           }
+          if (response.data.tWarehouseAgreement.fWarehouseid) {
+            this.form.fWarehouseid = JSON.parse(this.form.fWarehouseid)
+          }
           // this.fMblnoOptions = response.data.corps
           this.agreementitemsList = response.data.tWarehouseAgreementitems
           for (let item in this.agreementitemsList) {