提交综合协议，新增新增

src/api/synthesis/index.js

@@ -41,6 +41,14 @@ export function detailed(fId) {
         method: 'get'
     })
 }
+// 查询费用
+export function expenseQuery(data) {
+    return request({
+        url: 'basicdata/fees/list',
+        method: 'get',
+        params:data
+    })
+}
 
 // 查询明细
 export function submitSave(data) {
@@ -50,3 +58,10 @@ export function submitSave(data) {
         data:data
     })
 }
+// 删除主表
+export function deleteMainTable(fId) {
+    return request({
+        url: 'feeagreement/WarehouseFeeAgreementType/'+fId,
+        method: 'delete',
+    })
+}

src/views/agreement/synthesis/index.vue

@@ -7,7 +7,7 @@
             <el-form-item label="协议名称">
               <el-input v-model="form.name"
                         size="small"
-                        style="width: 250px"></el-input>
+                        style="width: 200px"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -16,6 +16,7 @@
                   v-model="form.region"
                   clearable
                   filterable
+                  size="small"
                   placeholder="请输入关键词"
                   style="width: 200px"
               >
@@ -32,7 +33,7 @@
             <el-form-item label="业务类型">
               <el-input v-model="form.type"
                         size="small"
-                        style="width: 250px"></el-input>
+                        style="width: 200px"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -396,7 +397,23 @@
             sortable
         >
           <template slot-scope="scope">
-            <span v-if="item.label == 'fFeeItem'">{{ scope.row[item.label] }}</span>
+            <span v-if="item.label == 'fFeeItem'">
+              <el-select
+                  v-model="scope.row[item.label]"
+                  clearable
+                  size="small"
+                  filterable
+                  placeholder="请选择费目"
+                  style="width: 100%"
+              >
+                <el-option
+                    v-for="(item, index) in fFeeItem"
+                    :key="index.fId"
+                    :label="item.fName"
+                    :value="item.fId"
+                ></el-option>
+              </el-select>
+            </span>
             <span v-else-if="item.label == 'fTFeeAgreementTypeFId'">
             <el-select
                 v-model="scope.row[item.label]"
@@ -549,9 +566,12 @@ import {
   detailed,
   costType,
   typeClassificationQuery,
-  submitSave
+  submitSave,
+  expenseQuery,
+  deleteMainTable
 } from "@/api/synthesis/index";
 import AddOrUpdate from "@/views/Warehousing/inStock/AddOrUpdate";
+import {delWarehouseFeeAgreementTypeBusiness} from "@/api/feeagreement/WarehouseFeeAgreementTypeBusiness";
 
 export default {
   name: "index",
@@ -649,6 +669,7 @@ export default {
       fIsValidOptions: [],
       fIsCommitOptions: [],
       fIsStandardOptions: [],
+      fFeeItem:[],
       // 表单参数
       form: {},
       classType: [],
@@ -674,6 +695,10 @@ export default {
     listCorpsTwo({type: 1}).then((response) => {
       this.fMblnoOptions = response.rows;
     });
+    expenseQuery({fFeetype:1}).then(res=>{
+      console.log(res)
+      this.fFeeItem = res.rows
+    })
     costType().then(res => {
       this.classType = res.rows
       console.log(res.rows)
@@ -690,7 +715,7 @@ export default {
     //录入明细
     entryDetails(){
       this.dataList.push({
-        fFeeItem:27,
+        fFeeItem:'',
         fTFeeAgreementTypeFId:this.classType[this.activeIndex].fId,
         fComputingMethod:'',
         fReceiptPaymentType:'',
@@ -700,7 +725,7 @@ export default {
     //提交保存
     submit(){
       let data = this.form
-      data.TWarehouseFeeAgreementType  = this.dataList
+      data.tWarehouseFeeAgreementTypeBusinessList  = this.dataList
       console.log(data)
       submitSave(data).then(res=>{
         console.log(res)
@@ -719,12 +744,14 @@ export default {
     },
     cancel() {
       this.getRow()
+      this.activeIndex = '0'
       this.dialogVisibleTwo = true
+      this.getList()
     },
     handleSelect(key, keyPath) {
       console.log(key, keyPath);
       this.activeIndex = key
-      typeClassificationQuery({fTFeeAgreementTypeFId: this.classType[key].fId}).then(res => {
+      typeClassificationQuery({fTFeeAgreementTypeFId: this.classType[key].fId,fWarehouseFeeAgreementTypeFId:this.form.fId}).then(res => {
         this.dataList = res.rows
       })
     },
@@ -847,7 +874,12 @@ export default {
       detailed(row.fId).then(res => {
         console.log(res)
         this.form = res.data
-        this.dataList = res.data.tWarehouseFeeAgreementTypeBusinessList
+        if (this.classType.length > 0){
+          typeClassificationQuery({fTFeeAgreementTypeFId: this.classType[0].fId,fWarehouseFeeAgreementTypeFId:this.form.fId}).then(res => {
+            this.dataList = res.rows
+          })
+        }
+        // this.dataList = res.data.tWarehouseFeeAgreementTypeBusinessList
         delete this.form.tWarehouseFeeAgreementTypeBusinessList
         console.log(this.form)
       })
@@ -862,9 +894,26 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      this.$confirm('是否确认删除费用协议从表编号为"' + row.fId + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return deleteMainTable(row.fId);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.setRowListTwo = this.getListOfDetailRows;
+      this.getRowListTwo = this.getListOfDetailRows;
+      this.dialogVisibleTwo = false
+      this.loadingTwo = false
+      this.form = {}
+      this.dataList = []
+      this.getDetailsList()
     },
     /** 重置按钮操作 */
     resetQuery() {