Browse Source

去除不需要的打印按钮;项目预算导入功能增加项目非空校验

ljb 9 months ago
parent
commit
1e9141f15f

+ 14 - 0
src/option/yfCostManage/basicDataSetting/yfCostBill.js

@@ -78,6 +78,13 @@ export default {
       width: 120,
       width: 120,
       align: 'center',
       align: 'center',
       showOverflowTooltip: true,
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请输入凭证字号',
+          trigger: 'blur',
+        },
+      ],
     },
     },
     {
     {
       label: '摘要',
       label: '摘要',
@@ -87,6 +94,13 @@ export default {
       width: 140,
       width: 140,
       align: 'center',
       align: 'center',
       showOverflowTooltip: true,
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请输入摘要',
+          trigger: 'blur',
+        },
+      ],
     },
     },
     {
     {
       label: '科目名称',
       label: '科目名称',

+ 2 - 14
src/option/yfCostManage/yfCostStatistics/zjtlCostSummaryList.js

@@ -16,6 +16,7 @@ export default {
   showSummary: true,
   showSummary: true,
   sumColumnList: [
   sumColumnList: [
     {
     {
+      label: '合计',
       name: 'cailiaofy',
       name: 'cailiaofy',
       type: 'sum',
       type: 'sum',
     },
     },
@@ -73,7 +74,7 @@ export default {
       prop: 'cailiaofy',
       prop: 'cailiaofy',
       type: 'number',
       type: 'number',
       span: 24,
       span: 24,
-      minWidth: 60,
+      minWidth: 100,
       align: 'center',
       align: 'center',
       min: 0,
       min: 0,
       precision: 2,
       precision: 2,
@@ -167,18 +168,5 @@ export default {
       precision: 2,
       precision: 2,
       showOverflowTooltip: true,
       showOverflowTooltip: true,
     },
     },
-    {
-      label: '费用区间',
-      prop: 'costRange',
-      type: 'number',
-      span: 24,
-      minWidth: 70,
-      align: 'center',
-      min: 0,
-      precision: 2,
-      search: true,
-      showOverflowTooltip: true,
-      hide: true
-    },
   ],
   ],
 };
 };

+ 4 - 0
src/views/project-manage/components/design-cost.vue

@@ -124,6 +124,10 @@ export default window.$crudCommon({
       this.selProject = data;
       this.selProject = data;
     },
     },
     handleImport() {
     handleImport() {
+      if (!this.params.xmId) {
+        this.$message.warning("请选择项目!");
+        return;
+      }
       let excelParams = { xmId: this.params.xmId };
       let excelParams = { xmId: this.params.xmId };
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-sjfy/import', excelParams);
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-sjfy/import', excelParams);
     },
     },

+ 4 - 0
src/views/project-manage/components/outsourcing-cost.vue

@@ -126,6 +126,10 @@ export default window.$crudCommon({
       this.selProject = data;
       this.selProject = data;
     },
     },
     handleImport() {
     handleImport() {
+      if (!this.params.xmId) {
+        this.$message.warning("请选择项目!");
+        return;
+      }
       let excelParams = { xmId: this.params.xmId };
       let excelParams = { xmId: this.params.xmId };
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-wtwbyjkffy/import', excelParams);
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-wtwbyjkffy/import', excelParams);
     },
     },

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

@@ -119,7 +119,7 @@ export default window.$crudCommon({
       this.option.column.forEach(item => {
       this.option.column.forEach(item => {
         if (item.prop == "technicianId") {
         if (item.prop == "technicianId") {
           let startDate = this.selProject.xmkssj || new Date();
           let startDate = this.selProject.xmkssj || new Date();
-          let endDate = this.selProject.xmjssj || new Date();
+          let endDate = this.selProject.xmkssj || new Date();
           item.dicUrl = '/api/kd-scientific/technician/page/date-interval';
           item.dicUrl = '/api/kd-scientific/technician/page/date-interval';
           item.dicQuery.startDate = moment(startDate).format("yyyyMM");
           item.dicQuery.startDate = moment(startDate).format("yyyyMM");
           item.dicQuery.endDate = moment(endDate).format("yyyyMM");
           item.dicQuery.endDate = moment(endDate).format("yyyyMM");
@@ -141,6 +141,10 @@ export default window.$crudCommon({
       this.selProject = data;
       this.selProject = data;
     },
     },
     handleImport() {
     handleImport() {
+      if (!this.params.xmId) {
+        this.$message.warning("请选择项目!");
+        return;
+      }
       let excelParams = {xmId: this.params.xmId };
       let excelParams = {xmId: this.params.xmId };
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-ryrgfy/import', excelParams);
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-ryrgfy/import', excelParams);
     },
     },

+ 4 - 0
src/views/project-manage/components/wxzctx-cost.vue

@@ -185,6 +185,10 @@ export default window.$crudCommon({
       this.selProject = data;
       this.selProject = data;
     },
     },
     handleImport() {
     handleImport() {
+      if (!this.params.xmId) {
+        this.$message.warning("请选择项目!");
+        return;
+      }
       let excelParams = { xmId: this.params.xmId };
       let excelParams = { xmId: this.params.xmId };
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-wxzctxfy/import', excelParams);
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-wxzctxfy/import', excelParams);
     },
     },

+ 4 - 0
src/views/project-manage/components/zb-cost.vue

@@ -126,6 +126,10 @@ export default window.$crudCommon({
       this.selProject = data;
       this.selProject = data;
     },
     },
     handleImport() {
     handleImport() {
+      if (!this.params.xmId) {
+        this.$message.warning("请选择项目!");
+        return;
+      }
       let excelParams = { xmId: this.params.xmId };
       let excelParams = { xmId: this.params.xmId };
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-zbtsysyfy/import', excelParams);
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-zbtsysyfy/import', excelParams);
     },
     },

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

@@ -185,6 +185,10 @@ export default window.$crudCommon({
       this.selProject = data;
       this.selProject = data;
     },
     },
     handleImport() {
     handleImport() {
+      if (!this.params.xmId) {
+        this.$message.warning("请选择项目!");
+        return;
+      }
       let excelParams = { xmId: this.params.xmId };
       let excelParams = { xmId: this.params.xmId };
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-zjfyycqdtfy/import', excelParams);
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-zjfyycqdtfy/import', excelParams);
     },
     },

+ 4 - 0
src/views/project-manage/components/zztl-cost.vue

@@ -125,6 +125,10 @@ export default window.$crudCommon({
       this.selProject = data;
       this.selProject = data;
     },
     },
     handleImport() {
     handleImport() {
+      if (!this.params.xmId) {
+        this.$message.warning("请选择项目!");
+        return;
+      }
       let excelParams = { xmId: this.params.xmId };
       let excelParams = { xmId: this.params.xmId };
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-zjtrfy/import', excelParams);
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-zjtrfy/import', excelParams);
     },
     },

+ 1 - 1
src/views/tech-person/month-cjcyry.vue

@@ -139,7 +139,7 @@ export default window.$crudCommon({
     handleProjectChange(data) {
     handleProjectChange(data) {
       this.technicianList = [];
       this.technicianList = [];
       let startDate = moment(data.xmkssj).format('yyyyMM');
       let startDate = moment(data.xmkssj).format('yyyyMM');
-      let endDate = moment(data.xmjssj).format('yyyyMM');
+      let endDate = moment(data.xmkssj).format('yyyyMM');
 
 
       getListByProDate(startDate, endDate).then(({ data }) => {
       getListByProDate(startDate, endDate).then(({ data }) => {
         if (data.code == 200) {
         if (data.code == 200) {

+ 1 - 1
src/views/yf-cost-manage/yf-cost-statistics/person-cost-statistics/yf-work-hours-allocation-list.vue

@@ -17,7 +17,7 @@
         >
         >
           导出
           导出
         </el-button>
         </el-button>
-        <print-table-btn @click="printTable" />
+        <!-- <print-table-btn @click="printTable" /> -->
         
         
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <year-month-select v-model="params.yearAndMonth" :showAllYear="false"></year-month-select>
           <year-month-select v-model="params.yearAndMonth" :showAllYear="false"></year-month-select>

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

@@ -16,7 +16,7 @@
         >
         >
           导出
           导出
         </el-button>
         </el-button>
-        <print-table-btn @click="printTable" />
+        <!-- <print-table-btn @click="printTable" /> -->
         
         
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <year-month-select v-model="params.yearAndMonth" :showAllYear="false"></year-month-select>
           <year-month-select v-model="params.yearAndMonth" :showAllYear="false"></year-month-select>

+ 3 - 3
src/views/yf-cost-manage/yf-cost-statistics/zjtl-cost-statistics/zjtl-cost-summary-list.vue.vue

@@ -15,21 +15,21 @@
         >
         >
           导出
           导出
         </el-button>
         </el-button>
-        <print-table-btn @click="printTable" />
+        <!-- <print-table-btn @click="printTable" /> -->
         
         
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <year-month-select v-model="params.yearAndMonth"></year-month-select>
           <year-month-select v-model="params.yearAndMonth"></year-month-select>
         </div>
         </div>
       </template>
       </template>
 
 
-      <template slot="costRangeSearch">
+      <!-- <template slot="costRangeSearch">
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
           <span>费用区间(元):</span>
           <span>费用区间(元):</span>
           <avue-input-number v-model="params.startSysm" :min="0" style="width: 100px !important;"></avue-input-number>
           <avue-input-number v-model="params.startSysm" :min="0" style="width: 100px !important;"></avue-input-number>
           <span style="width: 20px; text-align: center;">至</span>
           <span style="width: 20px; text-align: center;">至</span>
           <avue-input-number v-model="params.endSysm" :min="0" style="width: 100px !important;"></avue-input-number>
           <avue-input-number v-model="params.endSysm" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
         </div>
-      </template>
+      </template> -->
       
       
     </avue-crud>
     </avue-crud>