Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/api/warehouseBusiness/warehouseInStock.js

@@ -26,7 +26,16 @@ export function addWarehousebills(data) {
   })
 }
 
-// 入库详情信息入账
+// 撤销入库
+export function updateCredit(data) {
+  return request({
+    url: '/warehouseBusiness/inStock/updateCredit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 入库确认
 export function addWhgenleg(data) {
   return request({
     url: '/warehouseBusiness/inStock/addCredit',

src/views/agreement/agreementTask/index.vue

@@ -138,9 +138,9 @@
 
     <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="合同编号" align="center" prop="fContractno"/>
       <el-table-column label="客户名称" align="center" prop="fCorpid"/>
-      <el-table-column label="货物品名" align="center" prop="fGoodsid"/>
+      <el-table-column label="协议编号" align="center" prop="fContractno"/>
+      <el-table-column label="费用名称" align="center" prop="fFeeid"/>
       <el-table-column label="有效期起" align="center" prop="fBegindate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fBegindate, '{y}-{m}-{d}') }}</span>
@@ -192,9 +192,9 @@
     />
 
     <!-- 添加或修改仓储费对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body :before-close="handleClose" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="85%" append-to-body :before-close="handleClose" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px"
-               style="display: flex;flex-wrap: wrap;justify-content:space-around"
+               style="display: flex;flex-wrap: wrap;justify-content: flex-start;"
       >
         <el-form-item label="客户名称" prop="fCorpid">
           <el-select
@@ -216,30 +216,8 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="货物品名" prop="fGoodsid">
-<!--          <el-input v-model="form.fGoodsid" placeholder="请输入货物品名" style="width: 200px"/>-->
-          <el-select
-            v-model="form.fGoodsid"
-            filterable
-            remote
-            clearable
-            style="width: 200px"
-            :remote-method="goodsRemoteMethod"
-            @keyup.enter.native="handleQuery"
-            placeholder="请输入货物品名"
-          >
-            <el-option
-              v-for="(dict, index) in goodsOptions"
-              :key="index.fId"
-              :label="dict.fName"
-              :value="dict.fId"
-            ></el-option>
-          </el-select>
-
-
-        </el-form-item>
-        <el-form-item label="制单部门" prop="fDeptid">
-          <el-input v-model="form.fDeptid" :disabled="true" placeholder="请输入制单部门" style="width: 200px"/>
+        <el-form-item label="制单部门">
+          <el-input v-model="deptName" :disabled="true" placeholder="请输入制单部门" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="有效期起" prop="fBegindate">
           <el-date-picker clearable size="small" style="width: 200px"
@@ -259,10 +237,21 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="合同编号" prop="fContractno">
-          <el-input v-model="form.fContractno" placeholder="请输入合同编号" style="width: 200px"/>
+        <el-form-item label="协议编号" prop="fContractno">
+          <el-input v-model="form.fContractno" placeholder="请输入协议编号" style="width: 200px"/>
         </el-form-item>
 
+        <el-form-item label="商品类别" prop="tPackages">
+          <el-select v-model="form.tPackages" placeholder="请选择商品类别">
+            <el-option
+              v-for="dict in fTypeidOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+              style="width: 210px;"
+            ></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <el-button type="primary" @click="">请 核</el-button>
       <div class="dialogTableTitle flex a-center jlr">
@@ -270,18 +259,59 @@
         <el-button @click="getList_s()">新增</el-button>
       </div>
       <el-table v-loading="loading_s" :data="agreementitemsList" @selection-change="handleSelectionChange">
-<!--        <el-table-column type="selection" width="55" align="center"/>-->
+        <!--        <el-table-column type="selection" width="55" align="center"/>-->
         <el-table-column label="行号" align="center" type="index"/>
-        <el-table-column label="计价单位" align="center">
+
+        <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
+              :disabled="browseStatus"
+              remote
+              :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
+          prop="fFeeunitid"
+          header-align="center"
+          align="center"
+          width="180px"
+          label="计价单位"
+        >
           <template slot-scope="scope">
-            <el-input
+            <el-select
               v-model="scope.row.fFeeunitid"
-              placeholder="请输入计价单位"
+              placeholder="请选择计价单位"
+              @change="changeFeeUnit(scope.row)"
               clearable
-              size="small"
-            />
+              :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">
           <el-input
             slot-scope="scope"
@@ -293,7 +323,8 @@
         </el-table-column>
         <el-table-column label="录入人" align="center">
           <el-input
-            v-model="agreementitemsList.createBy"
+            slot-scope="scope"
+            v-model="scope.row.createBy"
             :disabled="true"
             placeholder="默认录入人"
             clearable
@@ -302,22 +333,15 @@
         </el-table-column>
         <el-table-column label="录入时间" align="center">
           <el-input
-            v-model="createTime"
+            slot-scope="scope"
+            v-model="scope.row.createTime"
             placeholder="默认录入时间"
             :disabled="true"
             clearable
             size="small"
           />
         </el-table-column>
-        <el-table-column label="费用名称" align="center">
-          <el-input
-            slot-scope="scope"
-            v-model="scope.row.fFeeid"
-            placeholder="请输入费用名称"
-            clearable
-            size="small"
-          />
-        </el-table-column>
+
 
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
@@ -355,6 +379,7 @@ import { listCorps } from '@/api/basicdata/corps'
 import { listGoods } from '@/api/basicdata/goods'
 import { delWarehousebills } from '@/api/warehouseBusiness/warehouseInStock'
 import { listGoodsTransfer } from '@/api/warehouseBusiness/goodsTransfer'
+import { listFees } from '@/api/basicdata/fees'
 // import { listUser, queryUserVal } from '@/api/system/user'
 
 export default {
@@ -366,12 +391,17 @@ export default {
       // 遮罩层
       loading: true,
       loading_s: false,
+      browseStatus: false,
+      jFeetunitOptions:[],
       goodsOptions:[],
-      createTime:'',
+      fTypeidOptions: [],
       // 选中数组
       ids: [],
+      deptName:'',
       // 客户(客户数据)
       fMblnoOptions: [],
+      fFeeunitidOptions: [],
+      fWbuOptions: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -440,6 +470,12 @@ export default {
     this.getDicts('data_trademodes').then(response => {
       this.fTrademodeidOptions = response.data
     })
+    this.getDicts("data_goods_category").then(response => {
+      this.fTypeidOptions = response.data;
+    });
+    this.getDicts("data_unitfees").then(response => {
+      this.jFeetunitOptions = response.data;
+    });
   },
   methods: {
     test_s(){
@@ -448,28 +484,38 @@ export default {
     /** 创建仓储费明细表列表 */
     getList_s() {
       console.log(this.agreementitemsList)
-      this.agreementitemsList.push({
-        //行号
-        fLineno:'',
-        //计价单位
-        fFeeunitid:'',
-        //费用名称
-        fFeeid:'',
-        //开始天数
-        fFromdays:'',
-        //结束天数
-        fEndays:'',
-        //单价
-        fPrice:'',
-        //录入人
-        createBy:'',
-        //创建时间
-        createTime:''
-      })
+      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")
+        })
+        // this.$set("deptName", response.dept.deptName);
+        this.deptName = response.dept.deptName
+        this.form.fDeptid = response.dept.deptId
+        this.agreementitemsList.createBy = response.user.userName
+
+        // this.$set(this.agreementitemsList, "createBy", response.user.userName);
+        //格式化时间戳
+        // this.$set(this.agreementitemsList, "createTime", moment(Date.parse(new Date())).format("YYYY-MM-DD HH:mm:ss"));
+      });
+
 
       listAgreementitems(this.queryParams).then(response => {
         console.log(response)
-
       })
     },
     /* 远程模糊查询商品 */
@@ -479,15 +525,17 @@ export default {
       }
       let queryParams = { pageNum: 1, pageSize: 10, fName: name };
       listGoods(queryParams).then((response) => {
-        console.log(response)
         this.goodsOptions = response.rows;
       });
     },
+    // 计价单位
+    fFeeunitidFormat(row, column) {
+      return this.selectDictLabel(this.fFeeunitidOptions, row.fFeeunitid);
+    },
     /** 查询仓储费列表 */
     getList() {
       this.loading = true
       listAgreement(this.queryParams).then(response => {
-        console.log(response)
         this.agreementList = response.rows
         this.total = response.total
         this.loading = false
@@ -548,6 +596,26 @@ export default {
       this.queryParams.pageNum = 1
       this.getList()
     },
+    // 变更计价单位
+    changeFeeUnit(row) {
+      console.log(this.fCntqty);
+      console.log(row);
+      if (!row.fFeeUnitid) {
+        return false;
+      }
+      if (row.fFeeUnitid === "0") {
+        this.$set(row, "fQty", this.fCntqty);
+      } else if (row.fFeeUnitid === "1") {
+        this.$set(row, "fQty", this.fGrossweight);
+      }
+      if (row.fUnitprice) {
+        this.$set(
+          row,
+          "fAmount",
+          parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2)
+        );
+      }
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm('queryForm')
@@ -559,18 +627,29 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
+    // 远程模糊查询费用名称
+    fWRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
+      listFees(queryParams).then((response) => {
+        this.fWbuOptions = response.rows;
+      });
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
       this.open = true
       this.title = '添加仓储费'
       queryUserVal().then((response) => {
-        console.log(response)
-        this.$set(this.form, "fDeptid", response.dept.deptId);
-        this.$set(this.agreementitemsList, "createBy", response.user.userName);
+        // this.$set("deptName", response.dept.deptName);
+        this.deptName = response.dept.deptName
+        this.form.fDeptid = response.dept.deptId
+        // this.agreementitemsList.createBy = response.user.userName
+
+        // this.$set(this.agreementitemsList, "createBy", response.user.userName);
         //格式化时间戳
-        this.agreementitemsList.createTime = Date.parse(new Date())
-        this.createTime = moment(Date.parse(new Date())).format("YYYY-MM-DD HH:mm:ss")
         // this.$set(this.agreementitemsList, "createTime", moment(Date.parse(new Date())).format("YYYY-MM-DD HH:mm:ss"));
       });
     },
@@ -579,12 +658,18 @@ export default {
       this.reset()
       const fId = row.fId || this.ids
       getAgreement(fId).then(response => {
+
+        console.log(this.deptName)
         console.log(response)
+        this.deptName = response.data.dept.deptName
         this.form = response.data.tWarehouseAgreement
         this.fMblnoOptions = response.data.corps
-        // this.goodsOptions  = response.data.corps
         this.agreementitemsList = response.data.tWarehouseAgreementitems
-        console.log(this.form)
+        for (let item in this.agreementitemsList) {
+          this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
+        }
+        console.log(JSON.stringify(this.agreementitemsList))
+
         this.open = true
         this.title = '修改仓储费'
       })
@@ -596,13 +681,13 @@ export default {
       }
       let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 };
       listCorps(queryParams).then((response) => {
-        console.log(response)
         this.fMblnoOptions = response.rows;
         this.KHblnoOptions = response.rows;
       });
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form)
       this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.fId != null) {
@@ -613,16 +698,10 @@ export default {
               formData.append("agreementitems", JSON.stringify(this.agreementitemsList));
               addAgreement(formData).then(response => {
                 this.msgSuccess('修改成功')
-                console.log(this.form)
                 this.open = false
                 this.getList()
                 this.agreementitemsList = []
               })
-
-
-              // this.open = false
-              // this.getList()
-              // this.agreementitemsList = []
             })
           } else {
             let formData = new window.FormData();
@@ -667,7 +746,6 @@ export default {
       })
     },
     deleteRow(index, rows) {
-
       rows.splice(index, 1);
     },
   }

src/views/warehouseBusiness/agreement/index.vue

@@ -192,9 +192,9 @@
     />
 
     <!-- 添加或修改仓储费对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body :before-close="handleClose" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="85%" append-to-body :before-close="handleClose" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px"
-               style="display: flex;flex-wrap: wrap;justify-content:space-around"
+               style="display: flex;flex-wrap: wrap;justify-content: flex-start;"
       >
         <el-form-item label="客户名称" prop="fCorpid">
           <el-select
@@ -216,28 +216,6 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="货物品名" prop="fGoodsid">
-<!--          <el-input v-model="form.fGoodsid" placeholder="请输入货物品名" style="width: 200px"/>-->
-          <el-select
-            v-model="form.fGoodsid"
-            filterable
-            remote
-            clearable
-            style="width: 200px"
-            :remote-method="goodsRemoteMethod"
-            @keyup.enter.native="handleQuery"
-            placeholder="请输入货物品名"
-          >
-            <el-option
-              v-for="(dict, index) in goodsOptions"
-              :key="index.fId"
-              :label="dict.fName"
-              :value="dict.fId"
-            ></el-option>
-          </el-select>
-
-
-        </el-form-item>
         <el-form-item label="制单部门">
           <el-input v-model="deptName" :disabled="true" placeholder="请输入制单部门" style="width: 200px"/>
         </el-form-item>
@@ -263,6 +241,17 @@
           <el-input v-model="form.fContractno" placeholder="请输入合同编号" style="width: 200px"/>
         </el-form-item>
 
+        <el-form-item label="商品类别" prop="tPackages">
+          <el-select v-model="form.tPackages" placeholder="请选择商品类别">
+            <el-option
+              v-for="dict in fTypeidOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+              style="width: 210px;"
+            ></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <el-button type="primary" @click="">请 核</el-button>
       <div class="dialogTableTitle flex a-center jlr">
@@ -272,16 +261,32 @@
       <el-table v-loading="loading_s" :data="agreementitemsList" @selection-change="handleSelectionChange">
 <!--        <el-table-column type="selection" width="55" align="center"/>-->
         <el-table-column label="行号" align="center" type="index"/>
-        <el-table-column label="计价单位" align="center">
+
+        <el-table-column
+          prop="fFeeunitid"
+          header-align="center"
+          align="center"
+          width="180px"
+          label="计价单位"
+        >
           <template slot-scope="scope">
-            <el-input
+            <el-select
               v-model="scope.row.fFeeunitid"
-              placeholder="请输入计价单位"
+              placeholder="请选择计价单位"
+              @change="changeFeeUnit(scope.row)"
               clearable
-              size="small"
-            />
+              :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
@@ -313,7 +318,8 @@
         </el-table-column>
         <el-table-column label="录入人" align="center">
           <el-input
-            v-model="agreementitemsList.createBy"
+            slot-scope="scope"
+            v-model="scope.row.createBy"
             :disabled="true"
             placeholder="默认录入人"
             clearable
@@ -322,21 +328,39 @@
         </el-table-column>
         <el-table-column label="录入时间" align="center">
           <el-input
-            v-model="agreementitemsList.createTime"
+            slot-scope="scope"
+            v-model="scope.row.createTime"
             placeholder="默认录入时间"
             :disabled="true"
             clearable
             size="small"
           />
         </el-table-column>
-        <el-table-column label="费用名称" align="center">
-          <el-input
-            slot-scope="scope"
-            v-model="scope.row.fFeeid"
-            placeholder="请输入费用名称"
-            clearable
-            size="small"
-          />
+
+        <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
+              :disabled="browseStatus"
+              remote
+              :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">
@@ -375,6 +399,7 @@ import { listCorps } from '@/api/basicdata/corps'
 import { listGoods } from '@/api/basicdata/goods'
 import { delWarehousebills } from '@/api/warehouseBusiness/warehouseInStock'
 import { listGoodsTransfer } from '@/api/warehouseBusiness/goodsTransfer'
+import { listFees } from '@/api/basicdata/fees'
 // import { listUser, queryUserVal } from '@/api/system/user'
 
 export default {
@@ -386,12 +411,17 @@ export default {
       // 遮罩层
       loading: true,
       loading_s: false,
+      browseStatus: false,
+      jFeetunitOptions:[],
       goodsOptions:[],
+      fTypeidOptions: [],
       // 选中数组
       ids: [],
       deptName:'',
       // 客户(客户数据)
       fMblnoOptions: [],
+      fFeeunitidOptions: [],
+      fWbuOptions: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -460,6 +490,12 @@ export default {
     this.getDicts('data_trademodes').then(response => {
       this.fTrademodeidOptions = response.data
     })
+    this.getDicts("data_goods_category").then(response => {
+      this.fTypeidOptions = response.data;
+    });
+    this.getDicts("data_unitfees").then(response => {
+      this.jFeetunitOptions = response.data;
+    });
   },
   methods: {
     test_s(){
@@ -468,28 +504,38 @@ export default {
     /** 创建仓储费明细表列表 */
     getList_s() {
       console.log(this.agreementitemsList)
-      this.agreementitemsList.push({
-        //行号
-        fLineno:'',
-        //计价单位
-        fFeeunitid:'',
-        //费用名称
-        fFeeid:'',
-        //开始天数
-        fFromdays:'',
-        //结束天数
-        fEndays:'',
-        //单价
-        fPrice:'',
-        //录入人
-        createBy:'',
-        //创建时间
-        createTime:''
-      })
+      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")
+        })
+        // this.$set("deptName", response.dept.deptName);
+        this.deptName = response.dept.deptName
+        this.form.fDeptid = response.dept.deptId
+        this.agreementitemsList.createBy = response.user.userName
+
+        // this.$set(this.agreementitemsList, "createBy", response.user.userName);
+        //格式化时间戳
+        // this.$set(this.agreementitemsList, "createTime", moment(Date.parse(new Date())).format("YYYY-MM-DD HH:mm:ss"));
+      });
+
 
       listAgreementitems(this.queryParams).then(response => {
         console.log(response)
-
       })
     },
     /* 远程模糊查询商品 */
@@ -499,15 +545,17 @@ export default {
       }
       let queryParams = { pageNum: 1, pageSize: 10, fName: name };
       listGoods(queryParams).then((response) => {
-        console.log(response)
         this.goodsOptions = response.rows;
       });
     },
+    // 计价单位
+    fFeeunitidFormat(row, column) {
+      return this.selectDictLabel(this.fFeeunitidOptions, row.fFeeunitid);
+    },
     /** 查询仓储费列表 */
     getList() {
       this.loading = true
       listAgreement(this.queryParams).then(response => {
-        console.log(response)
         this.agreementList = response.rows
         this.total = response.total
         this.loading = false
@@ -568,6 +616,26 @@ export default {
       this.queryParams.pageNum = 1
       this.getList()
     },
+    // 变更计价单位
+    changeFeeUnit(row) {
+      console.log(this.fCntqty);
+      console.log(row);
+      if (!row.fFeeUnitid) {
+        return false;
+      }
+      if (row.fFeeUnitid === "0") {
+        this.$set(row, "fQty", this.fCntqty);
+      } else if (row.fFeeUnitid === "1") {
+        this.$set(row, "fQty", this.fGrossweight);
+      }
+      if (row.fUnitprice) {
+        this.$set(
+          row,
+          "fAmount",
+          parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2)
+        );
+      }
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm('queryForm')
@@ -579,21 +647,30 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
+    // 远程模糊查询费用名称
+    fWRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
+      listFees(queryParams).then((response) => {
+        this.fWbuOptions = response.rows;
+      });
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
       this.open = true
       this.title = '添加仓储费'
       queryUserVal().then((response) => {
-
         // this.$set("deptName", response.dept.deptName);
         this.deptName = response.dept.deptName
-        // console.log(response.dept.deptName)
         this.form.fDeptid = response.dept.deptId
-        // console.log(this.form.fDeptid)
-        this.$set(this.agreementitemsList, "createBy", response.user.userName);
+        // this.agreementitemsList.createBy = response.user.userName
+
+        // this.$set(this.agreementitemsList, "createBy", response.user.userName);
         //格式化时间戳
-        this.$set(this.agreementitemsList, "createTime", moment(Date.parse(new Date())).format("YYYY-MM-DD HH:mm:ss"));
+        // this.$set(this.agreementitemsList, "createTime", moment(Date.parse(new Date())).format("YYYY-MM-DD HH:mm:ss"));
       });
     },
     /** 修改按钮操作 */
@@ -601,14 +678,16 @@ export default {
       this.reset()
       const fId = row.fId || this.ids
       getAgreement(fId).then(response => {
-        console.log(response)
+
+        this.deptName = response.data.dept.deptName
         this.form = response.data.tWarehouseAgreement
         this.fMblnoOptions = response.data.corps
-        // this.goodsOptions  = response.data.corps
         this.agreementitemsList = response.data.tWarehouseAgreementitems
+        for (let item in this.agreementitemsList) {
+          this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
+        }
+        console.log(JSON.stringify(this.agreementitemsList))
 
-        console.log(this.form)
-        console.log(response)
         this.open = true
         this.title = '修改仓储费'
       })
@@ -620,34 +699,27 @@ export default {
       }
       let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 };
       listCorps(queryParams).then((response) => {
-        console.log(response)
         this.fMblnoOptions = response.rows;
         this.KHblnoOptions = response.rows;
       });
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form)
       this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.fId != null) {
             updateAgreement(this.form).then(response => {
-              console.log(response)
               let formData = new window.FormData();
               // 附件数据
               formData.append("agreement",JSON.stringify(this.form))
               formData.append("agreementitems", JSON.stringify(this.agreementitemsList));
               addAgreement(formData).then(response => {
                 this.msgSuccess('修改成功')
-                console.log(response)
                 this.open = false
                 this.getList()
                 this.agreementitemsList = []
               })
-
-
-              // this.open = false
-              // this.getList()
-              // this.agreementitemsList = []
             })
           } else {
             let formData = new window.FormData();
@@ -692,7 +764,6 @@ export default {
       })
     },
     deleteRow(index, rows) {
-
       rows.splice(index, 1);
     },
   }

src/views/warehouseBusiness/inStock/index.vue

@@ -742,17 +742,15 @@
       </el-form>
 
       <div class="dialogTableTitle flex a-center jlr" style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
-        
+
         <div>
           <el-button type="primary" :disabled="browseStatus" @click.prevent="addRelevant()"
           >新行
         </el-button>
-        <el-button :disabled="dataListSelection.length <= 0" @click.prevent="creditClick()"
+        <el-button :disabled="dataListSelection.length <= 0" @click.prevent="creditClick"
           >入库确认
         </el-button>
-        <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRoww(warehouseDrList)"
-          >删除
-        </el-button> -->
+        <el-button :disabled="dataWithdrawList.length <= 0" @click.prevent="withdrawClick">撤回入库</el-button>
         <el-button :disabled="browseStatus" type="primary" @click="submitForm(2)">保 存</el-button>
         </div>
         <div>
@@ -1479,7 +1477,7 @@
         <!-- <el-button type="warning">仓储费协议</el-button> -->
         <el-button type="danger">作业费协议</el-button></div>
         <div style="font-size:18px">付款信息</div>
-  
+
       </div>
       <el-table
         :data="warehouseCrList"
@@ -2104,6 +2102,7 @@
 import print from "print-js";
 import {
   addWhgenleg,
+  updateCredit,
   listWarehousebills,
   getWarehousebills,
   delWarehousebills,
@@ -2196,6 +2195,8 @@ export default {
       whgenlegTotal: 0,
        // 库存明细入账数组
       dataListSelection: [],
+       // 库存明细撤回入账数组
+      dataWithdrawList: [],
       fSbuOptions: [],
       // 操作员
       userOptions: [],
@@ -2428,7 +2429,7 @@ export default {
         remark: null,
       });
     },
-    
+
     // 收货单打印界面
     showEditDialog_s() {
       if(this.Printinglist.length>0) {
@@ -2439,14 +2440,14 @@ export default {
           var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
           this.$set(this.Printinglist[aorp], 'fBsdate', Y + M + D)
      }
-          
+
       this.editDialogVisible_s = true;
             for(let corp in this.fMblnoOptions){
               if(this.form.fCorpid === this.fMblnoOptions[corp].fId) {
                 this.$set(this.form, "fCorpid", this.fMblnoOptions[corp].fName);
               }
             }
-            
+
             for(let sorp in this.warehouseOptions){
               console.log(this.form.fWarehouseid)
               if(this.form.fWarehouseid === this.warehouseOptions[sorp].fId) {
@@ -2533,7 +2534,7 @@ export default {
     },
      // 查询仓储费信息
     getWhgenlegList() {
-     
+
     },
     // 导入仓储费协议
     whgenlegData() {
@@ -2664,18 +2665,20 @@ export default {
         for (let se in selection) {
           if (!selection[se].fBillstatus || selection[se].fBillstatus !== '6') {
             this.dataListSelection.push(selection[se]);
+          } else if (selection[se].fBillstatus && selection[se].fBillstatus === '6') {
+            this.dataWithdrawList.push(selection[se])
           }
         }
         if (this.dataListSelection.length > 0) {
           this.fTruckno = selection[0].fTruckno;
-           this.fCntrtype = selection[0].fCntrtype;
+          this.fCntrtype = selection[0].fCntrtype;
           this.fGoodsids = selection[0].fGoodsids;
           var date = new Date(selection[0].fBsdate)
           var Y = date.getFullYear() + '-'
           var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
           var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
           this.fBsdate = Y + M + D;
-         
+
       }
       }
     },
@@ -2777,11 +2780,6 @@ export default {
         this.title = "修改仓入库";
       });
     },
-    // 库存明细多选框结果
-    dataListChange (row) {
-      console.log(JSON.stringify(row))
-      this.dataListSelection = row
-    },
      // 库存总账多选框
     whgenlegSelectionChange(selection) {
       this.dialogWhgenlegList = selection;
@@ -2908,13 +2906,6 @@ export default {
       }
       this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
     },
-    changefBsdate(row) {
-      if (this.dataList.length > 0) {
-        for (var i = 0; i < this.dataList.length; i++) {
-          this.$set(this.dataList[i], "fBsdate", row);
-        }
-      }
-    },
     changefCorpid(row) {
        this.$set(row, "fSbu", row.fCorpid);
     },
@@ -2998,6 +2989,32 @@ export default {
         }
       })
     },
+    // 撤回入账
+    withdrawClick() {
+      // 撤回入库
+      let formData = new window.FormData();
+      formData.append("warehouseBills", JSON.stringify(this.form))
+      formData.append("warehousebillsitems", JSON.stringify(this.dataWithdrawList))
+      updateCredit(formData).then((response) => {
+        this.fid = response.data;
+        this.formBrowseStatus = false
+        this.msgSuccess("撤销入账成功");
+        this.$refs.table.clearSelection();
+        for (let li in this.dataWithdrawList) {
+          for (let i in this.dataList) {
+            let fQty = this.dataList[i].fQty === this.dataWithdrawList[li].fQty;
+            let fBsdate = this.dataList[i].fBsdate === this.dataWithdrawList[li].fBsdate;
+            let fGoodsid = this.dataList[i].fGoodsid === this.dataWithdrawList[li].fGoodsid;
+            let fcntrtype = this.dataList[i].fcntrtype === this.dataWithdrawList[li].fcntrtype;
+            let fNetweight = this.dataList[i].fNetweight === this.dataWithdrawList[li].fNetweight;
+            let fGrossweight = this.dataList[i].fGrossweight === this.dataWithdrawList[li].fGrossweight;
+            if (fBsdate && fGoodsid && fcntrtype && fGrossweight && fNetweight && fQty) {
+              this.$set(this.dataList[i], 'fBillstatus', '1')
+            }
+          }
+        }
+      })
+    },
     /** 提交按钮 */
     submitForm(status) {
       this.$refs["form"].validate((valid) => {