Browse Source

bug修改

ljb 9 months ago
parent
commit
5571f0e140
23 changed files with 122 additions and 74 deletions
  1. 1 1
      src/mixins/crud.js
  2. 7 4
      src/option/basicResource/kyAssetList.js
  3. 21 21
      src/option/basicResource/technicianRoster.js
  4. 4 1
      src/option/deviceManage/assetLegder.js
  5. 4 1
      src/option/deviceManage/yfCostShareList.js
  6. 6 3
      src/option/yfCostManage/basicDataSetting/houseDetailList.js
  7. 6 3
      src/option/yfCostManage/basicDataSetting/kyDeviceList.js
  8. 6 3
      src/option/yfCostManage/basicDataSetting/wxzcDetail.js
  9. 4 1
      src/option/yfCostManage/yfCostStatistics/amortizeCostSummaryList.js
  10. 4 1
      src/option/yfCostManage/yfCostStatistics/devDepreAllocation.js
  11. 4 1
      src/option/yfCostManage/yfCostStatistics/hourseDepreAllocation.js
  12. 8 7
      src/page/index/logo.vue
  13. 3 0
      src/views/basic-resource/comp-basic-info/ky-asset-list.vue
  14. 4 3
      src/views/basic-resource/comp-basic-info/technician-roster.vue
  15. 1 1
      src/views/device-manage/asset-legder.vue
  16. 1 1
      src/views/device-manage/yf-cost-share-list.vue
  17. 1 0
      src/views/project-manage/components/all-budget-table.vue
  18. 22 9
      src/views/project-manage/components/project-budget.vue
  19. 9 9
      src/views/system/tenant.vue
  20. 3 1
      src/views/yf-cost-manage/basic-data-setting/month-salary-list.vue
  21. 1 1
      src/views/yf-cost-manage/yf-cost-statistics/wxzc-cost-statistics/amortize-cost-summary-list.vue
  22. 1 1
      src/views/yf-cost-manage/yf-cost-statistics/zjfy-cost-statistics/dev-depre-allocation.vue
  23. 1 1
      src/views/yf-cost-manage/yf-cost-statistics/zjfy-cost-statistics/hourse-depre-allocation.vue

+ 1 - 1
src/mixins/crud.js

@@ -64,7 +64,7 @@ export default (app, option = {}) => {
         this.api[option.list || 'getList'](this.page.currentPage, this.page.pageSize, this.getSearchParams()).then(res => {
           let data;
           if (option.res) {
-            data = option.res(res.data);
+            data = option.res(res.data, this);
           } else {
             data = res.data.data;
           }

+ 7 - 4
src/option/basicResource/kyAssetList.js

@@ -126,11 +126,11 @@ export default {
       ],
     },
     {
-      label: '使用寿命',
+      label: '使用寿命(月)',
       prop: 'sysm',
       type: 'number',
       span: 24,
-      width: 70,
+      width: 90,
       min: 0,
       precision: 0,
       search: true,
@@ -184,7 +184,7 @@ export default {
       ],
     },
     {
-      label: '净残值(%)',
+      label: '净残值(%)',
       prop: 'jcz',
       type: 'number',
       span: 24,
@@ -196,10 +196,13 @@ export default {
       rules: [
         {
           required: true,
-          message: '请输入净残值',
+          message: '请输入净残值',
           trigger: 'change',
         },
       ],
+      formatter:(row, value)=>{
+        return value+'%'
+      }
     },
     {
       label: '月折旧额/月摊销额(元)',

+ 21 - 21
src/option/basicResource/technicianRoster.js

@@ -249,13 +249,13 @@ export default {
         value: 'dictKey',
       },
       showOverflowTooltip: true,
-      rules: [
-        {
-          required: true,
-          message: '请选择最高学位',
-          trigger: 'change',
-        },
-      ],
+      // rules: [
+      //   {
+      //     required: true,
+      //     message: '请选择最高学位',
+      //     trigger: 'change',
+      //   },
+      // ],
     },
     {
       label: '最高学历学校',
@@ -303,13 +303,13 @@ export default {
         value: 'dictKey',
       },
       showOverflowTooltip: true,
-      rules: [
-        {
-          required: true,
-          message: '请选择职称',
-          trigger: 'change',
-        },
-      ],
+      // rules: [
+      //   {
+      //     required: true,
+      //     message: '请选择职称',
+      //     trigger: 'change',
+      //   },
+      // ],
     },
     {
       label: '职业资格',
@@ -319,13 +319,13 @@ export default {
       width: 100,
       align: 'center',
       showOverflowTooltip: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入职业资格',
-          trigger: 'blur',
-        },
-      ],
+      // rules: [
+      //   {
+      //     required: true,
+      //     message: '请输入职业资格',
+      //     trigger: 'blur',
+      //   },
+      // ],
     },
     {
       label: '其他说明',

+ 4 - 1
src/option/deviceManage/assetLegder.js

@@ -130,13 +130,16 @@ export default {
       showOverflowTooltip: true,
     },
     {
-      label: '净残值(%)',
+      label: '净残值(%)',
       prop: 'jcz',
       type: 'number',
       width: 110,
       search: true,
       align: 'center',
       showOverflowTooltip: true,
+      formatter:(row, value)=>{
+        return value+'%'
+      }
     },
     {
       label: '月折旧额/月摊销额(元)',

+ 4 - 1
src/option/deviceManage/yfCostShareList.js

@@ -77,13 +77,16 @@ export default {
       showOverflowTooltip: true,
     },
     {
-      label: '净残值(%)',
+      label: '净残值(%)',
       prop: 'jcz',
       type: 'number',
       width: 110,
       search: true,
       align: 'center',
       showOverflowTooltip: true,
+      formatter:(row, value)=>{
+        return value+'%'
+      }
     },
     {
       label: '月折旧额/月摊销额(元)',

+ 6 - 3
src/option/yfCostManage/basicDataSetting/houseDetailList.js

@@ -140,11 +140,11 @@ export default {
       display: false,
     },
     {
-      label: '使用寿命',
+      label: '使用寿命(月)',
       prop: 'sysm',
       type: 'number',
       span: 24,
-      width: 70,
+      width: 90,
       search: true,
       align: 'center',
       showOverflowTooltip: true,
@@ -174,7 +174,7 @@ export default {
       display: false,
     },
     {
-      label: '净残值(%)',
+      label: '净残值(%)',
       prop: 'jcz',
       type: 'number',
       span: 24,
@@ -182,6 +182,9 @@ export default {
       align: 'center',
       showOverflowTooltip: true,
       display: false,
+      formatter:(row, value)=>{
+        return value+'%'
+      }
     },
     {
       label: '月折旧额(每台/套)(K)',

+ 6 - 3
src/option/yfCostManage/basicDataSetting/kyDeviceList.js

@@ -140,11 +140,11 @@ export default {
       display: false,
     },
     {
-      label: '使用寿命',
+      label: '使用寿命(月)',
       prop: 'sysm',
       type: 'number',
       span: 24,
-      width: 70,
+      width: 90,
       search: true,
       align: 'center',
       showOverflowTooltip: true,
@@ -174,7 +174,7 @@ export default {
       display: false,
     },
     {
-      label: '净残值(%)',
+      label: '净残值(%)',
       prop: 'jcz',
       type: 'number',
       span: 24,
@@ -182,6 +182,9 @@ export default {
       align: 'center',
       showOverflowTooltip: true,
       display: false,
+      formatter:(row, value)=>{
+        return value+'%'
+      }
     },
     {
       label: '月折旧额(每台/套)(K)',

+ 6 - 3
src/option/yfCostManage/basicDataSetting/wxzcDetail.js

@@ -138,11 +138,11 @@ export default {
       display: false,
     },
     {
-      label: '使用寿命',
+      label: '使用寿命(月)',
       prop: 'sysm',
       type: 'number',
       span: 24,
-      width: 70,
+      width: 90,
       search: true,
       align: 'center',
       showOverflowTooltip: true,
@@ -172,7 +172,7 @@ export default {
       display: false,
     },
     {
-      label: '净残值(%)',
+      label: '净残值(%)',
       prop: 'jcz',
       type: 'number',
       span: 24,
@@ -180,6 +180,9 @@ export default {
       align: 'center',
       showOverflowTooltip: true,
       display: false,
+      formatter:(row, value)=>{
+        return value+'%'
+      }
     },
     {
       label: '月摊销额(每节点/套)(K)',

+ 4 - 1
src/option/yfCostManage/yfCostStatistics/amortizeCostSummaryList.js

@@ -108,7 +108,7 @@ export default {
       showOverflowTooltip: true,
     },
     {
-      label: '净残值(%)',
+      label: '净残值(%)',
       prop: 'jcz',
       type: 'number',
       span: 24,
@@ -116,6 +116,9 @@ export default {
       align: 'center',
       search: true,
       showOverflowTooltip: true,
+      formatter:(row, value)=>{
+        return value+'%'
+      }
     },
     {
       label: '月摊销额(每节点/套)(K)',

+ 4 - 1
src/option/yfCostManage/yfCostStatistics/devDepreAllocation.js

@@ -98,7 +98,7 @@ export default {
       showOverflowTooltip: true,
     },
     {
-      label: '净残值(%)',
+      label: '净残值(%)',
       prop: 'jcz',
       type: 'number',
       span: 24,
@@ -106,6 +106,9 @@ export default {
       align: 'center',
       search: true,
       showOverflowTooltip: true,
+      formatter:(row, value)=>{
+        return value+'%'
+      }
     },
     {
       label: '月折旧额(每台/套)',

+ 4 - 1
src/option/yfCostManage/yfCostStatistics/hourseDepreAllocation.js

@@ -106,7 +106,7 @@ export default {
       showOverflowTooltip: true,
     },
     {
-      label: '净残值(%)',
+      label: '净残值(%)',
       prop: 'jcz',
       type: 'number',
       span: 24,
@@ -115,6 +115,9 @@ export default {
       search: true,
       display: false,
       showOverflowTooltip: true,
+      formatter:(row, value)=>{
+        return value+'%'
+      }
     },
     {
       label: '月折旧额(每台/套)',

+ 8 - 7
src/page/index/logo.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="avue-logo">
+  <div class="avue-logo" style="width: 310px">
     <div style="display: flex; width: 100%; height: 100%; align-items: center; justify-content: center;">
     <transition name="fade">
       <!-- <span v-if="keyCollapse"
@@ -7,14 +7,15 @@
             key="0">
         <img :src="teantData.logoUrl" style="width: 45px;" />
       </span> -->
-      <img :src="teantData.logoUrl" style="width: 45px;" />
+      <img :src="teantData.logoUrl" style="padding-left: 36px; width: 45px;" />
     </transition>
-    <transition-group name="fade">
-      <template v-if="!keyCollapse">
+    <template v-if="!keyCollapse">
+      <div style="flex: 1; overflow: hidden; white-space: nowrap;">
         <span class="logo-title"
-              key="1">{{teantData.tenantName}} </span>
-      </template>
-    </transition-group>
+            key="1" :title="teantData.tenantName">{{teantData.tenantName}} </span>
+      </div>
+      
+    </template>
     </div>
   </div>
 </template>

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

@@ -162,8 +162,11 @@ export default window.$crudCommon({
         item.change = ({ item }) => {
           if (!!item && "软件,专利权,非专利技术".indexOf(item.dictValue) > -1) {
             newOption.column[3].display = false;
+            newOption.column[9].display = false;
+            this.form.jcz = "";
           } else {
             newOption.column[3].display = true;
+            newOption.column[9].display = true;
           }
         }
       }

+ 4 - 3
src/views/basic-resource/comp-basic-info/technician-roster.vue

@@ -160,10 +160,11 @@ export default window.$crudCommon({
       if (!this.form.number && !this.form.idCard) {
         this.$message.warning("工号和身份证号必须填写一项!");
         return false;
-      } else if (this.form.number && !isAlphanumericCombination(this.form.number)) {
-        this.$message.warning("工号必须是英文字母加数字组合!");
-        return false;
       }
+      // else if (this.form.number && !isAlphanumericCombination(this.form.number)) {
+      //   this.$message.warning("工号必须是英文字母加数字组合!");
+      //   return false;
+      // }
       return true;
     },
     getFormData() {

+ 1 - 1
src/views/device-manage/asset-legder.vue

@@ -64,7 +64,7 @@
         </div>
       </template>
 
-      <!-- 净残值 -->
+      <!-- 净残值 -->
       <template slot="jczSearch">
         <div style="display: flex; align-items: center;">
           <avue-input-number v-model="params.jczStart" :min="0"></avue-input-number>

+ 1 - 1
src/views/device-manage/yf-cost-share-list.vue

@@ -43,7 +43,7 @@
         </div>
       </template>
 
-      <!-- 净残值 -->
+      <!-- 净残值 -->
       <template slot="jczSearch">
         <div style="display: flex; align-items: center">
           <avue-input-number

+ 1 - 0
src/views/project-manage/components/all-budget-table.vue

@@ -129,6 +129,7 @@ export default {
     },
     handleProjectChange(data) {
       this.selProject = data;
+      this.$emit("change", data);
     },
     getAllBudgetData(id) {
       this.loading = true;

+ 22 - 9
src/views/project-manage/components/project-budget.vue

@@ -1,31 +1,31 @@
 <template>
   <el-tabs tab-position="left">
     <el-tab-pane label="研发项目费用预算表格" lazy>
-      <all-budget-table :projectId="projectId"></all-budget-table>
+      <all-budget-table :projectId="currProjectId" @change="handleBudgetChange"></all-budget-table>
     </el-tab-pane>
     <el-tab-pane label="一、人员人工费用" lazy>
-      <person-cost :projectId="projectId" />
+      <person-cost :projectId="currProjectId" />
     </el-tab-pane>
     <el-tab-pane label="二、直接投入费用" lazy>
-      <zztl-cost :projectId="projectId"></zztl-cost>
+      <zztl-cost :projectId="currProjectId"></zztl-cost>
     </el-tab-pane>
     <el-tab-pane label="三、折旧费用与长期待摊费用" lazy>
-      <zjfyycqdtfy-cost :projectId="projectId"></zjfyycqdtfy-cost>
+      <zjfyycqdtfy-cost :projectId="currProjectId"></zjfyycqdtfy-cost>
     </el-tab-pane>
     <el-tab-pane label="四、无形资产摊销费用" lazy>
-      <wxzctx-cost :projectId="projectId"></wxzctx-cost>
+      <wxzctx-cost :projectId="currProjectId"></wxzctx-cost>
     </el-tab-pane>
     <el-tab-pane label="五、设计费用" lazy>
-      <design-cost :projectId="projectId"></design-cost>
+      <design-cost :projectId="currProjectId"></design-cost>
     </el-tab-pane>
     <el-tab-pane label="六、装备调试费用与实验费用" lazy>
-      <zb-cost :projectId="projectId"></zb-cost>
+      <zb-cost :projectId="currProjectId"></zb-cost>
     </el-tab-pane>
     <el-tab-pane label="七、委托外部研究开发费" lazy>
-      <outsourcing-cost :projectId="projectId"></outsourcing-cost>
+      <outsourcing-cost :projectId="currProjectId"></outsourcing-cost>
     </el-tab-pane>
     <el-tab-pane label="八、其他费用" lazy>
-      <other-cost :projectId="projectId"></other-cost>
+      <other-cost :projectId="currProjectId"></other-cost>
     </el-tab-pane>
   </el-tabs>
 </template>
@@ -56,5 +56,18 @@ export default {
     outsourcingCost,
     otherCost
   },
+  data() {
+    return {
+      currProjectId: ""
+    }
+  },
+  mounted() {
+    this.currProjectId = this.projectId;
+  },
+  methods: {
+    handleBudgetChange(data) {
+      this.currProjectId = data.id;
+    }
+  }
 }
 </script>

+ 9 - 9
src/views/system/tenant.vue

@@ -260,13 +260,13 @@ export default {
           },
           {
             label: '所属省份',
-            prop: 'province',
+            prop: 'provinceCode',
             type: 'select',
             props: {
               label: 'name',
               value: 'code'
             },
-            cascader: ['city'],
+            cascader: ['cityCode'],
             dicUrl: '/api/kd-system/region/select',
             span: 24,
             hide: true,
@@ -277,15 +277,15 @@ export default {
           },
           {
             label: '所属地市',
-            prop: 'city',
+            prop: 'cityCode',
             type: 'select',
             props: {
               label: 'name',
               value: 'code'
             },
-            cascader: ['district'],
+            cascader: ['districtCode'],
             dicFlag: false,
-            dicUrl: '/api/kd-system/region/select?code={{province}}',
+            dicUrl: '/api/kd-system/region/select?code={{provinceCode}}',
             span: 24,
             hide: true,
             rules: [{
@@ -295,7 +295,7 @@ export default {
           },
           {
             label: '所属区县',
-            prop: 'district',
+            prop: 'districtCode',
             props: 'name',
             type: 'select',
             props: {
@@ -303,7 +303,7 @@ export default {
               value: 'code'
             },
             dicFlag: false,
-            dicUrl: '/api/kd-system/region/select?code={{city}}',
+            dicUrl: '/api/kd-system/region/select?code={{cityCode}}',
             span: 24,
             hide: true,
             rules: [{
@@ -525,7 +525,7 @@ export default {
     },
     rowSave(row, done, loading) {
       let params = { ...row };
-      params.regionCode = row.district;
+      // params.regionCode = row.district;
       params.vipYears = JSON.stringify(params.vipYears.split(','))
       add(row).then(() => {
         this.onLoad(this.page);
@@ -541,7 +541,7 @@ export default {
     },
     rowUpdate(row, index, done, loading) {
       let params = { ...row };
-      params.regionCode = row.district;
+      // params.regionCode = row.district;
       params.vipYears = JSON.stringify(params.vipYears.split(','))
       update(params).then(() => {
         this.onLoad(this.page);

+ 3 - 1
src/views/yf-cost-manage/basic-data-setting/month-salary-list.vue

@@ -225,10 +225,12 @@ export default window.$crudCommon({
 }, {
   // 模块路径
   name: 'yfCostManage/basicDataSetting/monthSalaryList',
-  res: ({ data }) => {
+  res: ({ data }, _this) => {
+    console.log(_this)
     data.records = data.records.map(item => {
       // 处理id为空的时候,批量清除数据无法获取数据的问题
       item.id = !item.id ? (item.number || item.idCard) : item.id;
+      item.yearAndMonth = _this.params.yearAndMonth;
       item.averageMonthlySalary = Number(item.averageMonthlySalary || 0).toFixed(2);
       item.pensionInsurance =  Number(item.pensionInsurance || 0).toFixed(2);
       item.medicalInsurance =  Number(item.medicalInsurance || 0).toFixed(2);

+ 1 - 1
src/views/yf-cost-manage/yf-cost-statistics/wxzc-cost-statistics/amortize-cost-summary-list.vue

@@ -38,7 +38,7 @@
 
       <template slot="jczSearch">
         <div style="display: flex; align-items: center;">
-          <span>净残值:</span>
+          <span>净残值:</span>
           <avue-input-number v-model="extraParams.jczMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <avue-input-number v-model="extraParams.jczMax" :min="0" style="width: 100px !important;"></avue-input-number>

+ 1 - 1
src/views/yf-cost-manage/yf-cost-statistics/zjfy-cost-statistics/dev-depre-allocation.vue

@@ -25,7 +25,7 @@
 
       <template slot="jczSearch">
         <div style="display: flex; align-items: center;">
-          <span>净残值:</span>
+          <span>净残值:</span>
           <avue-input-number v-model="extraParams.jczMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <avue-input-number v-model="extraParams.jczMax" :min="0" style="width: 100px !important;"></avue-input-number>

+ 1 - 1
src/views/yf-cost-manage/yf-cost-statistics/zjfy-cost-statistics/hourse-depre-allocation.vue

@@ -25,7 +25,7 @@
 
       <template slot="jczSearch">
         <div style="display: flex; align-items: center;">
-          <span>净残值:</span>
+          <span>净残值:</span>
           <avue-input-number v-model="extraParams.jczMin" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <avue-input-number v-model="extraParams.jczMax" :min="0" style="width: 100px !important;"></avue-input-number>