Browse Source

bug处理

ljb 6 months ago
parent
commit
e24709eb1e

+ 8 - 5
src/components/print-wide-table/index.vue

@@ -153,10 +153,10 @@ export default {
       type: Boolean,
       default: true
     },
-    rowsPerPage: {
-      type: Number,
-      default: 30
-    },
+    // rowsPerPage: {
+    //   type: Number,
+    //   default: 30
+    // },
     defaultLandscape: {
       type: Boolean,
       default: true
@@ -173,7 +173,9 @@ export default {
       // 计算后的表头行数据
       headerRows: [],
       // 扁平化的字段配置
-      tableFields: []
+      tableFields: [],
+
+      rowsPerPage: 99999999
     }
   },
   computed: {
@@ -341,6 +343,7 @@ export default {
       this.tableWidth = contentWidth > availableWidth ? contentWidth : availableWidth
     },
     getPageData(page) {
+      console.log(page, this.rowsPerPage)
       const start = (page - 1) * this.rowsPerPage
       const end = start + this.rowsPerPage
       return this.data.slice(start, end)

+ 1 - 0
src/components/year-month-select/index.vue

@@ -184,6 +184,7 @@ export default {
       // 找出大于目标的最小值
       const minGreater = greaterThan.length > 0 ? Math.min(...greaterThan) : null;
       
+      
       return {
         targetExists: false,
         targetValue: target,

+ 7 - 7
src/option/achievement/patentAchievement.js

@@ -163,13 +163,13 @@ export default {
       search: false,
       valueFormat: "yyyy-MM-dd",
       showOverflowTooltip: true,
-      rules: [
-        {
-          required: true,
-          message: "请选择授权日",
-          trigger: "blur",
-        },
-      ],
+      // rules: [
+      //   {
+      //     required: true,
+      //     message: "请选择授权日",
+      //     trigger: "blur",
+      //   },
+      // ],
     },
     {
       label: "申请单位",

+ 3 - 3
src/option/basicResource/kyAssetList.js

@@ -200,9 +200,9 @@ export default {
           trigger: 'change',
         },
       ],
-      formatter:(row, value)=>{
-        return value+'%'
-      }
+      // formatter:(row, value)=>{
+      //   return value+'%'
+      // }
     },
     {
       label: '月折旧额/月摊销额(元)',

+ 21 - 0
src/views/achievement/patent-achievement.vue

@@ -116,6 +116,27 @@ export default window.$crudCommon({
     }
   },
   methods: {
+    addBefore(loading, callback) {
+      if (!this.validCustom()) {
+        loading();
+        return;
+      }
+      callback && callback();
+    },
+    updateBefore(loading, callback) {
+      if (!this.validCustom()) {
+        loading();
+        return false;
+      }
+      callback && callback();
+    },
+    validCustom() {
+      if (this.form.flzt == '授权有效' && !this.form.shouquanRq) {
+        this.$message.warning("请选择授权日!");
+        return false;
+      }
+      return true;
+    },
     handleBeforeOpen(done, type) {
       if (type == 'add') {
         this.form = { zlqr: [""], gyqr: [""], fmr: [""] };

+ 5 - 4
src/views/basic-resource/comp-basic-info/ky-asset-list.vue

@@ -57,13 +57,14 @@
       </template>
 
       <template slot="gl" slot-scope="{row}">
-        <span v-if="'软件,专利,非专利技术'.indexOf(row.zclb) > -1">/</span>
+        <span v-if="'软件,专利,非专利技术'.indexOf(row.zclb) > -1">/</span>
         <span v-else>{{ row.gl }}</span>
       </template>
 
-      <!-- <template slot="glForm" slot-scope="{row}">
-        <el-input-number v-if="'软件,专利,非专利技术'.indexOf(row.zclb) === -1" type="number" />
-      </template> -->
+      <template slot="jcz" slot-scope="{row}">
+        <span v-if="'软件,专利权,非专利技术'.indexOf(row.zclb) > -1">/</span>
+        <span v-else>{{ row.jcz }}%</span>
+      </template>
 
       <!-- 开始时间 -->
       <template slot="kssjSearch">

+ 14 - 14
src/views/external-reports/external-manage/jjkc-discount-details.vue

@@ -40,12 +40,12 @@
           </tr>
           <tr>
             <td align="center">2</td>
-            <td align="left">一、自主研发、合作研发、集中研发</td>
+            <td align="left">一、自主研发、合作研发、集中研发(3+7+16+19+23+24)</td>
             <td align="center">{{ formData.d2 }}</td>
           </tr>
           <tr>
             <td align="center">3</td>
-            <td align="left" style="padding-left: 15px;">(一)人员人工费用</td>
+            <td align="left" style="padding-left: 15px;">(一)人员人工费用(4+5+6)</td>
             <td align="center">{{ formData.d3 }}</td>
           </tr>
           <tr>
@@ -65,7 +65,7 @@
           </tr>
           <tr>
             <td align="center">7</td>
-            <td align="left" style="padding-left: 15px;">(二)直接投入费用</td>
+            <td align="left" style="padding-left: 15px;">(二)直接投入费用(8+9+10+11+12+13+14+15)</td>
             <td align="center">{{ formData.d7 }}</td>
           </tr>
           <tr>
@@ -110,7 +110,7 @@
           </tr>
           <tr>
             <td align="center">16</td>
-            <td align="left" style="padding-left: 15px;">(三)折旧费用</td>
+            <td align="left" style="padding-left: 15px;">(三)折旧费用(17+18)</td>
             <td align="center">{{ formData.d16 }}</td>
           </tr>
           <tr>
@@ -125,7 +125,7 @@
           </tr>
           <tr>
             <td align="center">19</td>
-            <td align="left" style="padding-left: 15px;">(四)无形资产摊销</td>
+            <td align="left" style="padding-left: 15px;">(四)无形资产摊销(20+21+22)</td>
             <td align="center">{{ formData.d19 }}</td>
           </tr>
           <tr>
@@ -145,7 +145,7 @@
           </tr>
           <tr>
             <td align="center">23</td>
-            <td align="left" style="padding-left: 15px;">(五)新产品设计费</td>
+            <td align="left" style="padding-left: 15px;">(五)新产品设计费(24+25+26+27)</td>
             <td align="center">{{ formData.d23 }}</td>
           </tr>
           <tr>
@@ -165,12 +165,12 @@
           </tr>
           <tr>
             <td align="center">27</td>
-            <td align="left" style="padding-left: 50px;">4.精炼开发技术的现场试验费</td>
+            <td align="left" style="padding-left: 50px;">4.勘探开发技术的现场试验费</td>
             <td align="center">/</td>
           </tr>
           <tr>
             <td align="center">28</td>
-            <td align="left" style="padding-left: 15px;">(六)其他相关费用</td>
+            <td align="left" style="padding-left: 15px;">(六)其他相关费用(29+30+31+32+33)</td>
             <td align="center">{{ formData.d28 }}</td>
           </tr>
           <tr>
@@ -205,7 +205,7 @@
           </tr>
           <tr>
             <td align="center">35</td>
-            <td align="left">二、委托研发</td>
+            <td align="left">二、委托研发(36+37+39)</td>
             <td align="center">{{ formData.d35 }}</td>
           </tr>
           <tr>
@@ -230,7 +230,7 @@
           </tr>
           <tr>
             <td align="center">40</td>
-            <td align="left">三、年度研发费用小计</td>
+            <td align="left">三、年度研发费用小计(2+36×80%+38)</td>
             <td align="center">{{ formData.d40 }}</td>
           </tr>
           <tr>
@@ -259,7 +259,7 @@
           </tr>
           <tr>
             <td align="center">45</td>
-            <td align="left">六、允许扣除的研发费用合计</td>
+            <td align="left">六、允许扣除的研发费用合计(41+43+44)</td>
             <td align="center">{{ formData.d45 }}</td>
           </tr>
           <tr>
@@ -271,7 +271,7 @@
           </tr>
           <tr>
             <td align="center">47</td>
-            <td align="left">七、允许扣除的研发费用抵减特殊收入后的金额</td>
+            <td align="left">七、允许扣除的研发费用抵减特殊收入后的金额(45-46)</td>
             <td align="center">{{ formData.d47 }}</td>
           </tr>
           <tr>
@@ -297,12 +297,12 @@
           </tr>
           <tr>
             <td align="center">51</td>
-            <td align="left">九、本年研发费用加计扣除总额</td>
+            <td align="left">九、本年研发费用加计扣除总额(47-48-49)×50</td>
             <td align="center">{{ formData.d51 }}</td>
           </tr>
            <tr>
             <td align="center">52</td>
-            <td align="left">十、销售研发活动直接形成产品(包括组成部分)对应材料部分转移以后年度扣减金额</td>
+            <td align="left">十、销售研发活动直接形成产品(包括组成部分)对应材料部分转移以后年度扣减金额(当47-48-49≥0,本行=0;当47-48-49<0,本行=47-48-49的绝对值)</td>
             <td align="center">{{ formData.d52 }}</td>
           </tr>
         </tbody>

+ 12 - 2
src/views/project-manage/components/change-form.vue

@@ -406,12 +406,22 @@ export default {
           const params2 = this.getFormData('xmyszemx');
           params2.bgqdz = JSON.stringify(this.oldXmyszemxList);
 
-          Promise.all([this.saveData(params1), this.saveData(params2)]).then(([res1, res2]) => {
-            if (res1.data.success) {
+          this.saveData(params1).then(res => {
+            if (res.data.success) {
+              return this.saveData(params2)
+            }
+          }).then(res => {
+            if (res.data.success) {
               this.$message.success("保存成功!");
               this.$emit("success");
             }
           });
+          // Promise.all([this.saveData(params1), this.saveData(params2)]).then(([res1, res2]) => {
+          //   if (res1.data.success) {
+          //     this.$message.success("保存成功!");
+          //     this.$emit("success");
+          //   }
+          // });
         });
         return;
       }

+ 2 - 4
src/views/yf-cost-manage/yf-cost-statistics/zjtl-cost-statistics/cl-cost/components/common-page.vue

@@ -53,10 +53,8 @@
       </template>
       <template slot="tableFooter">
         <div>
-          <span style="margin-right: 140px;">发料人:</span>
-          <span>发料人:</span>
-        </div>
-        <div style="margin-top: 6px;">
+          <span style="margin-right: 180px;">发料人:</span>
+          <span style="margin-right: 180px;">领料人:</span>
           <span>项目负责人:</span>
         </div>
       </template>