Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/api/feeInfo/fee-info.js

@@ -10,4 +10,12 @@ export function delItem(data, url) {
       id: data
     }
   })
+}
+//费用删除
+export function delItem2(data, url) {
+  return request({
+    url: '/api'+url,
+    method: 'post',
+    data:data
+  })
 }

src/components/fee-info/main.vue

@@ -122,7 +122,7 @@
 import feeOption from "./config/feeInfo.json";
 import option from "./config/feeList.json";
 import { getDeptLazyTree, customerList } from "@/api/basicData/basicFeesDesc";
-import { delItem } from "@/api/feeInfo/fee-info";
+import { delItem,delItem2 } from "@/api/feeInfo/fee-info";
 import { isPercentage, micrometerFormat, IntegerFormat } from "@/util/validate";
 import cropDialog from "@/components/crop-dialog/main";
 import _ from "lodash";
@@ -251,6 +251,11 @@ export default {
       type: String,
       default: 'first'
     },
+    // 1.贸易 2.泽兴
+    delType: {
+      type: Number,
+      default: 1
+    },
   },
   filters: {
     isPercentage(val) {
@@ -417,13 +422,29 @@ export default {
       }).then(() => {
         //费用判断是否需要调用删除接口
         if (row.id) {
-          delItem(row.id, this.feeUrl).then(res => {
-            this.$message({
-              type: "success",
-              message: "删除成功!"
+          if (this.delType == 1) {
+            delItem(row.id, this.feeUrl).then(res => {
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.feeData.splice(index, 1);
             });
-            this.feeData.splice(index, 1);
-          });
+          } else {
+            let data={
+              srcParentId:row.id,
+              billType:this.itemType,
+              tradeType:this.optionType
+            }
+            delItem2(data, this.feeUrl).then(res => {
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.feeData.splice(index, 1);
+            });
+          }
+
         } else {
           this.$message({
             type: "success",
@@ -507,7 +528,7 @@ export default {
             params.exchangeRate = data.receivableParities;
             this.$refs.feeCrud.rowCellAdd(params);
           });
-        }else if(this.optionType == "JK") {
+        } else if (this.optionType == "JK") {
           getParities({
             currency: "USD",
             businesDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"

src/views/purchase/contract/detailsPage.vue

@@ -233,9 +233,9 @@
             </template>
           </avue-crud>
         </trade-card>
-        <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="viewDisabled" :itemType="'采购'"
+        <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="viewDisabled" :itemType="'申请'"
           activeName="second" :optionType="'JK'" @beforeFinance="beforeFinance" @afterFinance="afterFinance"
-          @getBillNo="getBillNo" feeUrl="" :corpId="form.corpId" :billNoList="billNoList" />
+          @getBillNo="getBillNo" feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId" :billNoList="billNoList" :delType="2" />
         <upload-file ref="uploadFile" title="合同附件" :disabled="viewDisabled" :orderFilesList="orderFilesList"
           delUrl="" />
       </el-form>

src/views/salesManagement/salesContract/detailsPage.vue

@@ -213,7 +213,7 @@
           </avue-crud>
         </trade-card>
         <fee-info ref="feeInfo" @beforeFinance="beforeFinance" @afterFinance="afterFinance" :disabled="viewDisabled"
-          :orderFeesList="orderFeesList" :itemType="'采购'" :optionType="'JK'" feeUrl="" :corpId="form.corpId" />
+          :orderFeesList="orderFeesList" :itemType="'收费'" optionType="'JK'" feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId" :delType="2" />
         <upload-file ref="uploadFile" title="合同附件" :disabled="viewDisabled"
           :orderFilesList="orderFilesList || viewDisabled" delUrl="" />
       </el-form>

src/views/workManagement/main-items/detailsPage.vue

@@ -134,7 +134,7 @@
               <el-option v-for="item in secondList" :key="item.id" :label="item.dictValue" :value="item.dictKey">
               </el-option>
             </el-select>
-            <span v-else>{{ row.frequency !=5 ? row.second : '-' }}</span>
+            <span v-else>{{ row.frequency != 5 ? row.second : '-' }}</span>
           </template>
           <template slot="amount" slot-scope="{ row }">
             <el-input v-if="row.$cellEdit" v-model="row.amount" placeholder="请输入" size="small"
@@ -751,7 +751,22 @@ export default {
 
         })
       })
+      //备注格式
+      let remark = "收入:\n" +
+        "1、业务名称:\n" +
+        "2、费用明细:\n" +
+        "3、业务负责人:\n" +
+        "4、优惠合计:\n" +
+        "5、实际收费:\n" +
+        "6、付款人:\n" +
+        "7、收款时间:\n" +
+        "8、收款人:\n" +
+        "9、收款方式:\n" +
+        "10、备注/特别说明:";
 
+      this.$nextTick(() => {
+        this.$set(this.form, "remark", remark)
+      })
     } else {
       //责任人  承揽人 默认当前登录人
       this.$set(this.formTwo, "corpAttn", this.$store.getters.userInfo.user_name)
@@ -1122,7 +1137,7 @@ export default {
           const params = {
             ...this.form,
             ...this.formTwo,
-            corpName:null,
+            corpName: null,
             itemList: this.dataList,
             filesList: this.upLoadData
           }
@@ -1288,7 +1303,7 @@ export default {
       this.getList();
     },
     frequencyChange(row) {
-      this.$set(row,'second',null)
+      this.$set(row, 'second', null)
       // row.second = null
     },
     //上传文件保存
@@ -1360,7 +1375,8 @@ export default {
             unit: item.unit,
             secondDisable: this.secondDisable,
             frequency: item.rate,
-            projectType: this.secondDisable
+            projectType: this.secondDisable,
+            commission:item.commission,
           }
           this.$refs.crud.rowCellAdd(params);
           this.$refs.crud.rowCell(item, this.optionFrom.length - 1)