Browse Source

项目长期待摊费用更改

ljb 10 months ago
parent
commit
bdeb8f22e4

+ 1 - 0
src/option/yfCostManage/yfCostStatistics/otherCostSummaryList.js

@@ -8,6 +8,7 @@ export default {
   index: true,
   index: true,
   selection: true,
   selection: true,
   addBtn: false,
   addBtn: false,
+  menu: false,
   searchLabelWidth: 140,
   searchLabelWidth: 140,
   labelWidth: 130,
   labelWidth: 130,
   menuWidth: 140,
   menuWidth: 140,

+ 3 - 0
src/views/basic-resource/comp-basic-info/ky-asset-list.vue

@@ -165,6 +165,9 @@ export default window.$crudCommon({
       this.page.currentPage = 1;
       this.page.currentPage = 1;
       this.getList();
       this.getList();
     },
     },
+    getFormData() {
+      return { ...this.form, yearAndMonth: this.params.yearAndMonth };
+    },
     getDelParams(row) {
     getDelParams(row) {
       return [{ id: row.id, yearAndMonth: this.params.yearAndMonth }];
       return [{ id: row.id, yearAndMonth: this.params.yearAndMonth }];
     },
     },

+ 5 - 5
src/views/project-manage/components/zjfyycqdtfy-cost.vue

@@ -51,7 +51,7 @@
         <print-table-btn @click="printTable" />
         <print-table-btn @click="printTable" />
       </template>
       </template>
 
 
-      <template slot="zcbm" slot-scope="scope">
+      <template slot="assetId" slot-scope="scope">
         <span>{{ scope.row.zcmc }}</span>
         <span>{{ scope.row.zcmc }}</span>
       </template>
       </template>
       
       
@@ -114,7 +114,7 @@ export default window.$crudCommon({
     let newOption = { ...this.option };
     let newOption = { ...this.option };
     // 姓名下拉框,设置监听事件
     // 姓名下拉框,设置监听事件
     newOption.column.forEach(item => {
     newOption.column.forEach(item => {
-      if (item.prop == "zcbm") {
+      if (item.prop == "assetId") {
         item.change = ({ item }) => {
         item.change = ({ item }) => {
           if (!!item) {
           if (!!item) {
             this.currZcObj = item;
             this.currZcObj = item;
@@ -213,9 +213,9 @@ export default window.$crudCommon({
   name: 'projectManage/zjfyycqdtfyCost',
   name: 'projectManage/zjfyycqdtfyCost',
   res: ({ data }) => {
   res: ({ data }) => {
     data.records = data.records.map(item => {
     data.records = data.records.map(item => {
-      item.zcmc = item.zcEntity.zcmc;
-      item.zcbm = item.zcEntity.zcbm;
-      item.yzje = (item.zcEntity.yzje || 0).toFixed(2);
+      // item.zcmc = item.zcmc;
+      // item.zcbm = item.zcbm;
+      item.yzje = (item.yzje || 0).toFixed(2);
       item.cqdtfyysje = (item.cqdtfyysje || 0).toFixed(2);
       item.cqdtfyysje = (item.cqdtfyysje || 0).toFixed(2);
 
 
       let zzscD = new Decimal(item.zzsc || 0); // 工作时长
       let zzscD = new Decimal(item.zzsc || 0); // 工作时长