协议管理，修改，请下载moment依赖包正常运行前端

package.json

@@ -52,6 +52,7 @@
     "js-beautify": "1.10.2",
     "js-cookie": "2.2.0",
     "jsencrypt": "3.0.0-rc.1",
+    "moment": "^2.29.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",

src/api/agreement/agreement.js

@@ -0,0 +1,87 @@
+import request from '@/utils/request'
+// 查询当前登录用户信息
+export function queryUserVal(query) {
+  return request({
+    url: '/system/user/queryUserVal',
+    method: 'post'
+  })
+}
+
+// 查询客户详情列表
+export function listCorps(query) {
+  return request({
+    url: '/basicdata/customerDetails/corps/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询商品详情列表
+export function listGoods(query) {
+  return request({
+    url: '/basicdata/goods/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询仓储费列表
+export function listAgreement(query) {
+  return request({
+    url: '/warehouseBusiness/agreementTask/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询仓储费详细
+export function getAgreement(fId) {
+  return request({
+    url: '/warehouseBusiness/agreementTask/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增仓储费
+export function addAgreement(data) {
+  return request({
+    url: '/warehouseBusiness/agreementTask',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改仓储费
+export function updateAgreement(data) {
+  return request({
+    url: '/warehouseBusiness/agreementTask',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除仓储费
+export function delAgreement(fId) {
+  return request({
+    url: '/warehouseBusiness/agreementTask/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出仓储费
+export function exportAgreement(query) {
+  return request({
+    url: '/warehouseBusiness/agreementTask/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询仓储费明细表列表
+export function listAgreementitems(query) {
+  return request({
+    url: '/warehouseBusiness/agreementTask/list',
+    method: 'get',
+    params: query
+  })
+}

src/api/warehouseBusiness/agreement.js

@@ -1,4 +1,29 @@
 import request from '@/utils/request'
+// 查询当前登录用户信息
+export function queryUserVal(query) {
+  return request({
+    url: '/system/user/queryUserVal',
+    method: 'post'
+  })
+}
+
+// 查询客户详情列表
+export function listCorps(query) {
+  return request({
+    url: '/basicdata/customerDetails/corps/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询商品详情列表
+export function listGoods(query) {
+  return request({
+    url: '/basicdata/goods/list',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询仓储费列表
 export function listAgreement(query) {

src/views/agreement/agreementTask/index.vue

@@ -0,0 +1,673 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <!--      <el-form-item label="业务编号" prop="fBillno">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fBillno"-->
+      <!--          placeholder="请输入业务编号"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <el-form-item label="客户名称" prop="fCorpid">
+        <el-select
+          v-model="queryParams.fCorpid"
+          filterable
+          remote
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+          :remote-method="corpsRemoteMethod"
+          placeholder="请输入客户名称"
+        >
+          <el-option
+            v-for="(dict, index) in fMblnoOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="货物品名" prop="fGoodsid">
+        <el-select
+          v-model="queryParams.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="queryParams.fDeptid"
+          placeholder="请输入制单部门"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="有效期起" prop="fBegindate">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.fBegindate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择有效期起"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="有效期至" prop="fEnddate">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.fEnddate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择有效期至"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="协议编号" prop="fContractno">
+        <el-input
+          v-model="queryParams.fContractno"
+          placeholder="请输入协议编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd()"
+          v-hasPermi="['warehouseBusiness:agreement:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['warehouseBusiness:agreement:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['warehouseBusiness:agreement:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['warehouseBusiness:agreement:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <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="fBegindate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fBegindate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="有效期至" align="center" prop="fEnddate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fEnddate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <!--      <el-table-column label="状态" align="center" prop="fId" />-->
+      <el-table-column label="状态" align="center" prop="fBillstatus"/>
+      <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-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['warehouseBusiness:agreement:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['warehouseBusiness:agreement:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+      <!--      <el-table-column label="业务编号" align="center" prop="fBillno" />-->
+      <!--      <el-table-column label="制单部门" align="center" prop="fDeptid" />-->
+      <!--      <el-table-column label="结算方式" align="center" prop="fStltypeid" :formatter="fStltypeidFormat" />-->
+      <!--      <el-table-column label="费用类型" align="center" prop="fFeetypeid" />-->
+      <!--      <el-table-column label="货物类别" align="center" prop="tPackages" :formatter="tPackagesFormat" />-->
+      <!--      <el-table-column label="贸易方式" align="center" prop="fTrademodeid" :formatter="fTrademodeidFormat" />-->
+      <!--      <el-table-column label="免堆天数" align="center" prop="fFreedays" />-->
+      <!--      <el-table-column label="备注" align="center" prop="remark" />-->
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改仓储费对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="80%" 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"
+      >
+        <el-form-item label="客户名称" prop="fCorpid">
+          <el-select
+            v-model="form.fCorpid"
+            filterable
+            remote
+            clearable
+            style="width: 200px"
+            @keyup.enter.native="handleQuery"
+            :remote-method="corpsRemoteMethod"
+            placeholder="请输入客户名称"
+          >
+            <el-option
+              v-for="(dict, index) in fMblnoOptions"
+              :key="index.fId"
+              :label="dict.fName"
+              :value="dict.fId"
+            ></el-option>
+          </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>
+        <el-form-item label="有效期起" prop="fBegindate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.fBegindate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择有效期起"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="有效期至" prop="fEnddate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.fEnddate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择有效期至"
+          >
+          </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>
+
+      </el-form>
+      <el-button type="primary" @click="">请 核</el-button>
+      <div class="dialogTableTitle flex a-center jlr">
+        <h2>标题</h2>
+        <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 label="行号" align="center" type="index"/>
+        <el-table-column label="计价单位" align="center">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fFeeunitid"
+              placeholder="请输入计价单位"
+              clearable
+              size="small"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="单价" align="center">
+          <el-input
+            slot-scope="scope"
+            v-model="scope.row.fPrice"
+            placeholder="请输入单价"
+            clearable
+            size="small"
+          />
+        </el-table-column>
+        <el-table-column label="录入人" align="center">
+          <el-input
+            v-model="agreementitemsList.createBy"
+            :disabled="true"
+            placeholder="默认录入人"
+            clearable
+            size="small"
+          />
+        </el-table-column>
+        <el-table-column label="录入时间" align="center">
+          <el-input
+            v-model="agreementitemsList.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">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click.native.prevent="deleteRow(scope.$index, agreementitemsList)"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import moment from 'moment'
+import {
+  listAgreement,
+  getAgreement,
+  delAgreement,
+  addAgreement,
+  updateAgreement,
+  exportAgreement,
+  listAgreementitems,
+  queryUserVal,
+} from '@/api/agreement/agreement'
+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 { listUser, queryUserVal } from '@/api/system/user'
+
+export default {
+  name: 'Agreement',
+  components: {},
+  data() {
+    return {
+      dataList: '',
+      // 遮罩层
+      loading: true,
+      loading_s: false,
+      goodsOptions:[],
+      // 选中数组
+      ids: [],
+      // 客户(客户数据)
+      fMblnoOptions: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 仓储费表格数据
+      agreementList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 结算方式,也可以从表t_stltypes中下拉选择，存储id，显示name字典
+      fStltypeidOptions: [],
+      // 货物类别,存储t_packages，f_id 显示名称，可以多选t_packages 中的no或 name，模糊查找选择后，存储f_id，显示name字典
+      tPackagesOptions: [],
+      // 贸易方式,对应t_trademodels 字典
+      fTrademodeidOptions: [],
+      // 仓储费明细表表格数据
+      agreementitemsList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fBillno: null,
+        fDeptid: null,
+        fContractno: null,
+        fCorpid: null,
+        fStltypeid: null,
+        fGoodsid: null,
+        fFeetypeid: null,
+        tPackages: null,
+        fTrademodeid: null,
+        fFreedays: null,
+        fBegindate: null,
+        fEnddate: null,
+        fBillstatus: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        fBillno: [
+          {
+            required: true,
+            message: ' ',
+            trigger: 'blur'
+          }
+        ],
+        fCorpid: [
+          { required: true, message: ' ', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created() {
+    this.getList()
+    this.getDicts('data_settlement_method').then(response => {
+      this.fStltypeidOptions = response.data
+    })
+    this.getDicts('data_package_unit').then(response => {
+      this.tPackagesOptions = response.data
+    })
+    this.getDicts('data_trademodes').then(response => {
+      this.fTrademodeidOptions = response.data
+    })
+  },
+  methods: {
+    test_s(){
+      console.log(this.agreementitemsList)
+    },
+    /** 创建仓储费明细表列表 */
+    getList_s() {
+      console.log(this.agreementitemsList)
+      this.agreementitemsList.push({
+        //行号
+        fLineno:'',
+        //计价单位
+        fFeeunitid:'',
+        //费用名称
+        fFeeid:'',
+        //开始天数
+        fFromdays:'',
+        //结束天数
+        fEndays:'',
+        //单价
+        fPrice:'',
+        //录入人
+        createBy:'',
+        //创建时间
+        createTime:''
+      })
+
+      listAgreementitems(this.queryParams).then(response => {
+        console.log(response)
+
+      })
+    },
+    /* 远程模糊查询商品 */
+    goodsRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
+      listGoods(queryParams).then((response) => {
+        console.log(response)
+        this.goodsOptions = response.rows;
+      });
+    },
+    /** 查询仓储费列表 */
+    getList() {
+      this.loading = true
+      listAgreement(this.queryParams).then(response => {
+        console.log(response)
+        this.agreementList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+
+    // 结算方式,也可以从表t_stltypes中下拉选择，存储id，显示name字典翻译
+    fStltypeidFormat(row, column) {
+      return this.selectDictLabel(this.fStltypeidOptions, row.fStltypeid)
+    },
+    // 货物类别,存储t_packages，f_id 显示名称，可以多选t_packages 中的no或 name，模糊查找选择后，存储f_id，显示name字典翻译
+    tPackagesFormat(row, column) {
+      return this.selectDictLabel(this.tPackagesOptions, row.tPackages)
+    },
+    // 贸易方式,对应t_trademodels 字典翻译
+    fTrademodeidFormat(row, column) {
+      return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid)
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.agreementitemsList = []
+      this.reset()
+    },
+    handleClose(){
+      this.open = false
+      this.agreementitemsList = []
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fId: null,
+        fBillno: null,
+        fDeptid: null,
+        fContractno: null,
+        fCorpid: null,
+        fStltypeid: null,
+        fGoodsid: null,
+        fFeetypeid: null,
+        tPackages: null,
+        fTrademodeid: null,
+        fFreedays: null,
+        fBegindate: null,
+        fEnddate: null,
+        fBillstatus: '0',
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.fId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加仓储费'
+      queryUserVal().then((response) => {
+        console.log(response.user.userName)
+        this.$set(this.form, "fDeptid", response.dept.deptId);
+        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"));
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const fId = row.fId || this.ids
+      getAgreement(fId).then(response => {
+        this.form = response.data.tWarehouseAgreement
+        this.fMblnoOptions = response.data.corps
+        // this.goodsOptions  = response.data.corps
+        this.agreementitemsList = response.data.tWarehouseAgreementitems
+        console.log(this.form)
+        console.log(response)
+        this.open = true
+        this.title = '修改仓储费'
+      })
+    },
+    /** 远程模糊查询用户 */
+    corpsRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      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() {
+      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();
+            // 附件数据
+            formData.append("agreement",JSON.stringify(this.form))
+            formData.append("agreementitems", JSON.stringify(this.agreementitemsList));
+            addAgreement(formData).then(response => {
+              this.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+              this.agreementitemsList = []
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const fIds = row.fId || this.ids;
+      this.$confirm('是否确认删除仓储费编号为"' + fIds + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delAgreement(fIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams
+      this.$confirm('是否确认导出所有仓储费数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return exportAgreement(queryParams)
+      }).then(response => {
+        this.download(response.msg)
+      })
+    },
+    deleteRow(index, rows) {
+
+      rows.splice(index, 1);
+    },
+  }
+}
+</script>

src/views/warehouseBusiness/agreement/index.vue

@@ -11,22 +11,42 @@
       <!--        />-->
       <!--      </el-form-item>-->
       <el-form-item label="客户名称" prop="fCorpid">
-        <el-input
+        <el-select
           v-model="queryParams.fCorpid"
-          placeholder="请输入客户名称"
+          filterable
+          remote
           clearable
-          size="small"
+          style="width: 200px"
           @keyup.enter.native="handleQuery"
-        />
+          :remote-method="corpsRemoteMethod"
+          placeholder="请输入客户名称"
+        >
+          <el-option
+            v-for="(dict, index) in fMblnoOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="货物品名" prop="fGoodsid">
-        <el-input
+        <el-select
           v-model="queryParams.fGoodsid"
-          placeholder="请输入货物品名"
+          filterable
+          remote
           clearable
-          size="small"
+          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
@@ -172,18 +192,54 @@
     />
 
     <!-- 添加或修改仓储费对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="80%" 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"
       >
         <el-form-item label="客户名称" prop="fCorpid">
-          <el-input v-model="form.fCorpid" placeholder="请输入客户名称" style="width: 200px"/>
+          <el-select
+            v-model="form.fCorpid"
+            filterable
+            remote
+            clearable
+            style="width: 200px"
+            @keyup.enter.native="handleQuery"
+            :remote-method="corpsRemoteMethod"
+            placeholder="请输入客户名称"
+          >
+            <el-option
+              v-for="(dict, index) in fMblnoOptions"
+              :key="index.fId"
+              :label="dict.fName"
+              :value="dict.fId"
+            ></el-option>
+          </el-select>
         </el-form-item>
+
         <el-form-item label="货物品名" prop="fGoodsid">
-          <el-input v-model="form.fGoodsid" placeholder="请输入货物品名" style="width: 200px"/>
+<!--          <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" 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"
@@ -207,71 +263,16 @@
           <el-input v-model="form.fContractno" placeholder="请输入合同编号" style="width: 200px"/>
         </el-form-item>
 
-        <!--        <el-form-item label="业务编号" prop="fBillno">-->
-        <!--          <el-input v-model="form.fBillno" placeholder="请输入业务编号" />-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="结算方式" prop="fStltypeid">-->
-        <!--          <el-select v-model="form.fStltypeid" placeholder="请选择结算方式">-->
-        <!--            <el-option-->
-        <!--              v-for="dict in fStltypeidOptions"-->
-        <!--              :key="dict.dictValue"-->
-        <!--              :label="dict.dictLabel"-->
-        <!--              :value="parseInt(dict.dictValue)"-->
-        <!--            ></el-option>-->
-        <!--          </el-select>-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="费用类型" prop="fFeetypeid">-->
-        <!--          <el-select v-model="form.fFeetypeid" placeholder="请选择费用类型">-->
-        <!--            <el-option label="请选择字典生成" value="" />-->
-        <!--          </el-select>-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="货物类别" prop="tPackages">-->
-        <!--          <el-select v-model="form.tPackages" placeholder="请选择货物类别">-->
-        <!--            <el-option-->
-        <!--              v-for="dict in tPackagesOptions"-->
-        <!--              :key="dict.dictValue"-->
-        <!--              :label="dict.dictLabel"-->
-        <!--              :value="dict.dictValue"-->
-        <!--            ></el-option>-->
-        <!--          </el-select>-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="贸易方式" prop="fTrademodeid">-->
-        <!--          <el-select v-model="form.fTrademodeid" placeholder="请选择贸易方式">-->
-        <!--            <el-option-->
-        <!--              v-for="dict in fTrademodeidOptions"-->
-        <!--              :key="dict.dictValue"-->
-        <!--              :label="dict.dictLabel"-->
-        <!--              :value="parseInt(dict.dictValue)"-->
-        <!--            ></el-option>-->
-        <!--          </el-select>-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="免堆天数" prop="fFreedays">-->
-        <!--          <el-input v-model="form.fFreedays" placeholder="请输入免堆天数" />-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="状态">-->
-        <!--          <el-radio-group v-model="form.fBillstatus">-->
-        <!--            <el-radio label="1">请选择字典生成</el-radio>-->
-        <!--          </el-radio-group>-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="删除状态" prop="delFlag">-->
-        <!--          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="备注" prop="remark">-->
-        <!--          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />-->
-        <!--        </el-form-item>-->
       </el-form>
       <el-button type="primary" @click="">请 核</el-button>
       <div class="dialogTableTitle flex a-center jlr">
         <h2>标题</h2>
-        <!--        <el-button :disabled="browseStatus" @click.prevent="addRelevant()">新增</el-button>-->
-        <!--        <el-button :disabled="dataListSelection.length <= 0" @click.prevent="creditClick()">入库确认</el-button>-->
-        <!--        <el-button :disabled="browseStatus" @click.prevent="deleteRoww(warehouseDrList)">删除</el-button>-->
         <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 label="行号" align="center" type="index" width="100" />
-        <el-table-column label="计价单位" align="center" width="150">
+<!--        <el-table-column type="selection" width="55" align="center"/>-->
+        <el-table-column label="行号" align="center" type="index"/>
+        <el-table-column label="计价单位" align="center">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fFeeunitid"
@@ -281,26 +282,27 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="开始天数" align="center" width="250">
+        <el-table-column label="开始天数" align="center">
           <template slot-scope="scope">
-            <el-date-picker clearable size="small"
-                            v-model="scope.row.fFromdays"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择有效期起">
-            </el-date-picker>
+            <el-input
+              v-model="scope.row.fFromdays"
+              placeholder="请输入开始天数"
+              clearable
+              size="small"
+            />
           </template>
         </el-table-column>
-        <el-table-column label="结束天数" align="center" width="250">
-          <el-date-picker clearable size="small"
-                          slot-scope="scope"
-                          v-model="scope.row.fEndays"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择有效期起">
-          </el-date-picker>
+        <el-table-column label="结束天数" align="center">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fEndays"
+              placeholder="请输入结束天数"
+              clearable
+              size="small"
+            />
+          </template>
         </el-table-column>
-        <el-table-column label="单价" align="center" width="150">
+        <el-table-column label="单价" align="center">
           <el-input
             slot-scope="scope"
             v-model="scope.row.fPrice"
@@ -309,25 +311,25 @@
             size="small"
           />
         </el-table-column>
-        <el-table-column label="录入人" align="center" width="150">
+        <el-table-column label="录入人" align="center">
           <el-input
-            slot-scope="scope"
-            v-model="scope.row.createBy"
+            v-model="agreementitemsList.createBy"
+            :disabled="true"
             placeholder="默认录入人"
             clearable
             size="small"
           />
         </el-table-column>
-        <el-table-column label="录入时间" align="center" width="150">
+        <el-table-column label="录入时间" align="center">
           <el-input
-            slot-scope="scope"
-            v-model="scope.row.createTime"
+            v-model="agreementitemsList.createTime"
             placeholder="默认录入时间"
+            :disabled="true"
             clearable
             size="small"
           />
         </el-table-column>
-        <el-table-column label="费用名称" align="center" width="150">
+        <el-table-column label="费用名称" align="center">
           <el-input
             slot-scope="scope"
             v-model="scope.row.fFeeid"
@@ -358,6 +360,7 @@
 </template>
 
 <script>
+import moment from 'moment'
 import {
   listAgreement,
   getAgreement,
@@ -365,8 +368,14 @@ import {
   addAgreement,
   updateAgreement,
   exportAgreement,
-  listAgreementitems
+  listAgreementitems,
+  queryUserVal,
 } from '@/api/warehouseBusiness/agreement'
+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 { listUser, queryUserVal } from '@/api/system/user'
 
 export default {
   name: 'Agreement',
@@ -377,8 +386,12 @@ export default {
       // 遮罩层
       loading: true,
       loading_s: false,
+      goodsOptions:[],
       // 选中数组
       ids: [],
+      deptName:'',
+      // 客户(客户数据)
+      fMblnoOptions: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -426,15 +439,12 @@ export default {
         fBillno: [
           {
             required: true,
-            message: '业务编号,格式WA+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始不能为空',
+            message: ' ',
             trigger: 'blur'
           }
         ],
-        fDeptid: [
-          { required: true, message: '制单部门不能为空', trigger: 'blur' }
-        ],
         fCorpid: [
-          { required: true, message: '客户名称,t_corps 中的no或 name，模糊查找选择后，存储id，显示name不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ]
       }
     }
@@ -482,6 +492,17 @@ export default {
 
       })
     },
+    /* 远程模糊查询商品 */
+    goodsRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
+      listGoods(queryParams).then((response) => {
+        console.log(response)
+        this.goodsOptions = response.rows;
+      });
+    },
     /** 查询仓储费列表 */
     getList() {
       this.loading = true
@@ -492,6 +513,7 @@ export default {
         this.loading = false
       })
     },
+
     // 结算方式,也可以从表t_stltypes中下拉选择，存储id，显示name字典翻译
     fStltypeidFormat(row, column) {
       return this.selectDictLabel(this.fStltypeidOptions, row.fStltypeid)
@@ -507,6 +529,12 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false
+      this.agreementitemsList = []
+      this.reset()
+    },
+    handleClose(){
+      this.open = false
+      this.agreementitemsList = []
       this.reset()
     },
     // 表单重置
@@ -556,26 +584,70 @@ export default {
       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.$set(this.agreementitemsList, "createTime", moment(Date.parse(new Date())).format("YYYY-MM-DD HH:mm:ss"));
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
       const fId = row.fId || this.ids
       getAgreement(fId).then(response => {
-        this.form = response.data
+        console.log(response)
+        this.form = response.data.tWarehouseAgreement
+        this.fMblnoOptions = response.data.corps
+        // this.goodsOptions  = response.data.corps
+        this.agreementitemsList = response.data.tWarehouseAgreementitems
+
+        console.log(this.form)
+        console.log(response)
         this.open = true
         this.title = '修改仓储费'
       })
     },
+    /** 远程模糊查询用户 */
+    corpsRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      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() {
       this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.fId != null) {
             updateAgreement(this.form).then(response => {
-              this.msgSuccess('修改成功')
-              this.open = false
-              this.getList()
+              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();
@@ -586,6 +658,7 @@ export default {
               this.msgSuccess('新增成功')
               this.open = false
               this.getList()
+              this.agreementitemsList = []
             })
           }
         }
@@ -593,7 +666,17 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      console.log(row)
+      const fIds = row.fId || this.ids;
+      this.$confirm('是否确认删除仓储费编号为"' + fIds + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delAgreement(fIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {