Browse Source

阶段性提交

ljb 10 months ago
parent
commit
1275526d4d

+ 39 - 0
src/api/yfCostManage/basicDataSetting/projectZjtrCost.js

@@ -0,0 +1,39 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/kd-scientific/technician/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/kd-scientific/technician/save',
+    method: 'post',
+    data: row
+  })
+}
+
+
+export const update = (row) => {
+  return request({
+    url: '/api/kd-scientific/technician/update',
+    method: 'post',
+    data: row
+  })
+}
+
+
+export const remove = (data) => {
+  return request({
+    url: '/api/kd-scientific/technician/remove',
+    method: 'post',
+    data
+  })
+}

+ 33 - 3
src/option/yfCostManage/basicDataSetting/leaseRecords.js

@@ -16,11 +16,11 @@ export default {
   showSummary: true,
   sumColumnList: [
     {
-      name: 'lqsl',
+      name: 'dj',
       type: 'sum',
     },
     {
-      name: 'je',
+      name: 'zj',
       type: 'sum'
     }
   ],
@@ -29,10 +29,18 @@ export default {
       label: '日期',
       prop: 'rq',
       type: 'date',
+      valueFormat: 'yyyy-MM-dd',
       span: 24,
       width: 100,
       align: 'center',
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请选择日期',
+          trigger: 'blur',
+        },
+      ],
     },
     {
       label: '研发项目编号',
@@ -47,12 +55,19 @@ export default {
     },
     {
       label: '研发项目名称',
-      prop: 'xmmc',
+      prop: 'xmId',
       type: 'select',
       span: 24,
       minWidth: 160,
       search: true,
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请选择研发项目名称',
+          trigger: 'blur',
+        },
+      ],
     },
     {
       label: '租赁资产类型',
@@ -68,6 +83,13 @@ export default {
         value: 'dictKey',
       },
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请选择租赁资产类型',
+          trigger: 'blur',
+        },
+      ],
     },
     {
       label: '租赁资产名称',
@@ -78,6 +100,13 @@ export default {
       width: 160,
       align: 'center',
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请输入租赁资产名称',
+          trigger: 'blur',
+        },
+      ],
     },
     {
       label: '型号规格',
@@ -120,6 +149,7 @@ export default {
       min: 0,
       precision: 2,
       showOverflowTooltip: true,
+      display: false
     },
   ],
 };

+ 38 - 1
src/option/yfCostManage/basicDataSetting/pickingDetail.js

@@ -29,10 +29,18 @@ export default {
       label: '日期',
       prop: 'rq',
       type: 'date',
+      valueFormat: 'yyyy-MM-dd',
       span: 24,
       width: 100,
       align: 'center',
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请选择日期',
+          trigger: 'blur',
+        },
+      ],
     },
     {
       label: '研发项目编号',
@@ -47,12 +55,19 @@ export default {
     },
     {
       label: '研发项目名称',
-      prop: 'xmmc',
+      prop: 'xmId',
       type: 'select',
       span: 24,
       minWidth: 160,
       search: true,
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请选择研发项目名称',
+          trigger: 'blur',
+        },
+      ],
     },
     {
       label: '类型',
@@ -68,6 +83,13 @@ export default {
         value: 'dictKey',
       },
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请选择类型',
+          trigger: 'blur',
+        },
+      ],
     },
     {
       label: '物资编号',
@@ -78,6 +100,13 @@ export default {
       width: 100,
       align: 'center',
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请输入物资编号',
+          trigger: 'blur',
+        },
+      ],
     },
     {
       label: '物资名称',
@@ -87,6 +116,13 @@ export default {
       search: true,
       minWidth: 160,
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请输入物资名称',
+          trigger: 'blur',
+        },
+      ],
     },
     {
       label: '型号规格',
@@ -138,6 +174,7 @@ export default {
       min: 0,
       precision: 2,
       showOverflowTooltip: true,
+      display: false
     },
   ],
 };

+ 102 - 0
src/option/yfCostManage/basicDataSetting/projectZjtrCost.js

@@ -0,0 +1,102 @@
+export default {
+  height: 'auto',
+  calcHeight: 30,
+  tip: false,
+  searchShow: true,
+  searchMenuSpan: 6,
+  border: true,
+  index: true,
+  selection: true,
+  searchLabelWidth: 140,
+  labelWidth: 130,
+  menuWidth: 140,
+  dialogClickModal: false,
+  dialogWidth: 500,
+  dialogType: "drawer",
+  showSummary: true,
+  sumColumnList: [
+    {
+      name: 'je',
+      type: 'sum',
+    },
+  ],
+  column: [
+    {
+      label: '日期',
+      prop: 'rq',
+      type: 'date',
+      valueFormat: 'yyyy-MM-dd',
+      span: 24,
+      width: 100,
+      align: 'center',
+      search: true,
+      showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请选择日期',
+          trigger: 'blur',
+        },
+      ],
+    },
+    {
+      label: '研发项目编号',
+      prop: 'xmbh',
+      type: 'input',
+      span: 24,
+      search: true,
+      width: 100,
+      align: 'center',
+      showOverflowTooltip: true,
+      display: false,
+    },
+    {
+      label: '研发项目名称',
+      prop: 'xmId',
+      type: 'select',
+      span: 24,
+      minWidth: 160,
+      search: true,
+      showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请选择研发项目名称',
+          trigger: 'blur',
+        },
+      ],
+    },
+    {
+      label: '直投费用类型',
+      prop: 'zlzclx',
+      type: 'select',
+      span: 24,
+      minWidth: 260,
+      search: true,
+      dicUrl: '/api/kd-system/dict-biz/dictionary?code=renyuanleixing',
+      props: {
+        label: 'dictValue',
+        value: 'dictKey',
+      },
+      showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请选择直投费用类型',
+          trigger: 'blur',
+        },
+      ],
+    },
+    {
+      label: '单价(元)',
+      prop: 'je',
+      type: 'number',
+      span: 24,
+      width: 100,
+      align: 'center',
+      min: 0,
+      precision: 2,
+      showOverflowTooltip: true,
+    },
+  ],
+};

+ 9 - 0
src/util/regex.js

@@ -0,0 +1,9 @@
+// 验证数字加加字母组合
+export const isAlphanumericCombination = (str) => {
+  // 正则表达式解释:
+  // ^(?=.*[0-9]) - 必须包含至少一个数字
+  // (?=.*[a-zA-Z]) - 必须包含至少一个字母(大小写不限)
+  // [a-zA-Z0-9]+$ - 只能包含字母和数字
+  const regex = /^(?=.*[0-9])(?=.*[a-zA-Z])[a-zA-Z0-9]+$/;
+  return regex.test(str);
+}

+ 126 - 0
src/views/yf-cost-manage/basic-data-setting/ky-device-list.vue

@@ -0,0 +1,126 @@
+<template>
+  <basic-container>
+    <avue-crud
+      v-bind="bindVal"
+      v-on="onEvent"
+      v-model="form"
+      :page.sync="page"
+    >
+      <template slot="menuLeft">
+         <el-button
+          type="danger"
+          size="small"
+          icon="el-icon-delete"
+          plain
+          @click="handleDelete"
+        >
+          删 除
+        </el-button>
+        <el-button
+          type="success"
+          size="small"
+          plain
+          icon="el-icon-upload2"
+          @click="handleImport"
+        >
+          导入
+        </el-button>
+        <el-button
+          type="warning"
+          size="small"
+          plain
+          icon="el-icon-download"
+          @click="handleExport"
+        >
+          导出
+        </el-button>
+        <print-table-btn @click="printTable" />
+        
+        <div style="display: flex; align-items: center;">
+          <year-month-select v-model="params.yearAndMonth" :showAllYear="false"></year-month-select>
+        </div>
+      </template>
+
+      <template slot="xmmcForm">
+        <project-select placeholder="请选择项目名称" v-model="form.xmId" @change="handleProjectChange"></project-select>
+      </template>
+      
+    </avue-crud>
+
+    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+
+    <WideTablePrinter
+      ref="printWideTable"
+      :columns="wideTableColumns"
+      :data="data"
+      :print-title="printTitle"
+      :rows-per-page="30"
+      :default-landscape="true"
+    />
+  </basic-container>
+</template>
+
+<script>
+import YearMonthSelect from "@/components/year-month-select";
+import UploadExcelDialog from "@/components/upload-excel-dialog";
+import projectSelect from "@/components/project-select";
+import moment from "moment";
+
+
+export default window.$crudCommon({
+  components: {
+    YearMonthSelect,
+    projectSelect,
+    UploadExcelDialog,
+  },
+  data() {
+    return {
+      params: {
+        yearAndMonth: moment(new Date()).format('YYYYMM'),
+      },
+      defaultColumns: [],
+
+      wideTableColumns: [],
+      printTitle: "",
+    };
+  },
+  watch: {
+    'params.yearAndMonth'(newVal) {
+      this.page.currentPage = 1;
+      this.getList(this.page);
+    }
+  },
+  methods: {
+    handleImport() {
+      let excelParams = { yearAndMonth: this.params.yearAndMonth };
+      this.$refs.uploadExcelDialog.open('/api/kd-scientific/technician/import', excelParams);
+    },
+    uploadAfter() {
+      this.page.currentPage = 1;
+      this.getList(this.page);
+    },
+    handleExport() {
+      exportBloByPost(`/api/kd-scientific/technician/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
+        downloadXls(res.data, `项目直接投入费用表${this.params.yearAndMonth}.xlsx`);
+      });
+    },
+    /**
+     * 打印表格
+     * @param isLandscape 是否横向打印
+     */
+    printTable(isLandscape) {
+      this.wideTableColumns = this.$refs.crud.columnOption;
+      this.printTitle = `项目直接投入费用表${this.params.yearAndMonth}`;
+      this.$nextTick(() => {
+        this.$refs.printWideTable.printTable(isLandscape);
+      })
+    },
+  },
+}, {
+  // 模块路径
+  name: 'yfCostManage/basicDataSetting/projectZjtrCost',
+  res: ({ data }) => {
+    return data;
+  },
+});
+</script>

+ 1 - 1
src/views/yf-cost-manage/basic-data-setting/lease-records.vue

@@ -41,7 +41,7 @@
         </div>
       </template>
 
-      <template slot="xmmcForm">
+      <template slot="xmIdForm">
         <project-select placeholder="请选择项目名称" v-model="form.xmId" @change="handleProjectChange"></project-select>
       </template>
       

+ 25 - 1
src/views/yf-cost-manage/basic-data-setting/picking-detail.vue

@@ -41,7 +41,7 @@
         </div>
       </template>
 
-      <template slot="xmmcForm">
+      <template slot="xmIdForm">
         <project-select placeholder="请选择项目名称" v-model="form.xmId" @change="handleProjectChange"></project-select>
       </template>
       
@@ -65,6 +65,7 @@ import YearMonthSelect from "@/components/year-month-select";
 import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import moment from "moment";
+import { isAlphanumericCombination } from "@/util/regex";
 
 
 export default window.$crudCommon({
@@ -91,6 +92,29 @@ export default window.$crudCommon({
     }
   },
   methods: {
+    validCustom() {
+      if (!isAlphanumericCombination(this.form.wzbh)) {
+        this.$message.warning("物质编号必须是英文字母加数字组合!");
+        return false;
+      }
+      return true;
+    },
+    addBefore(loading, callback) {
+      console.log(this.form)
+      if (!this.validCustom()) {
+        loading();
+        return;
+      }
+      // callback && callback();
+    },
+    updateBefore(loading, callback) {
+      if (!this.validCustom()) {
+        loading();
+        return false;
+      }
+      console.log(this.form)
+      // callback && callback();
+    },
     handleImport() {
       let excelParams = { yearAndMonth: this.params.yearAndMonth };
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/technician/import', excelParams);

+ 126 - 0
src/views/yf-cost-manage/basic-data-setting/project-zjtl-cost.vue

@@ -0,0 +1,126 @@
+<template>
+  <basic-container>
+    <avue-crud
+      v-bind="bindVal"
+      v-on="onEvent"
+      v-model="form"
+      :page.sync="page"
+    >
+      <template slot="menuLeft">
+         <el-button
+          type="danger"
+          size="small"
+          icon="el-icon-delete"
+          plain
+          @click="handleDelete"
+        >
+          删 除
+        </el-button>
+        <el-button
+          type="success"
+          size="small"
+          plain
+          icon="el-icon-upload2"
+          @click="handleImport"
+        >
+          导入
+        </el-button>
+        <el-button
+          type="warning"
+          size="small"
+          plain
+          icon="el-icon-download"
+          @click="handleExport"
+        >
+          导出
+        </el-button>
+        <print-table-btn @click="printTable" />
+        
+        <div style="display: flex; align-items: center;">
+          <year-month-select v-model="params.yearAndMonth" :showAllYear="false"></year-month-select>
+        </div>
+      </template>
+
+      <template slot="xmIdForm">
+        <project-select placeholder="请选择项目名称" v-model="form.xmId" @change="handleProjectChange"></project-select>
+      </template>
+      
+    </avue-crud>
+
+    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+
+    <WideTablePrinter
+      ref="printWideTable"
+      :columns="wideTableColumns"
+      :data="data"
+      :print-title="printTitle"
+      :rows-per-page="30"
+      :default-landscape="true"
+    />
+  </basic-container>
+</template>
+
+<script>
+import YearMonthSelect from "@/components/year-month-select";
+import UploadExcelDialog from "@/components/upload-excel-dialog";
+import projectSelect from "@/components/project-select";
+import moment from "moment";
+
+
+export default window.$crudCommon({
+  components: {
+    YearMonthSelect,
+    projectSelect,
+    UploadExcelDialog,
+  },
+  data() {
+    return {
+      params: {
+        yearAndMonth: moment(new Date()).format('YYYYMM'),
+      },
+      defaultColumns: [],
+
+      wideTableColumns: [],
+      printTitle: "",
+    };
+  },
+  watch: {
+    'params.yearAndMonth'(newVal) {
+      this.page.currentPage = 1;
+      this.getList(this.page);
+    }
+  },
+  methods: {
+    handleImport() {
+      let excelParams = { yearAndMonth: this.params.yearAndMonth };
+      this.$refs.uploadExcelDialog.open('/api/kd-scientific/technician/import', excelParams);
+    },
+    uploadAfter() {
+      this.page.currentPage = 1;
+      this.getList(this.page);
+    },
+    handleExport() {
+      exportBloByPost(`/api/kd-scientific/technician/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
+        downloadXls(res.data, `项目直接投入费用表${this.params.yearAndMonth}.xlsx`);
+      });
+    },
+    /**
+     * 打印表格
+     * @param isLandscape 是否横向打印
+     */
+    printTable(isLandscape) {
+      this.wideTableColumns = this.$refs.crud.columnOption;
+      this.printTitle = `项目直接投入费用表${this.params.yearAndMonth}`;
+      this.$nextTick(() => {
+        this.$refs.printWideTable.printTable(isLandscape);
+      })
+    },
+  },
+}, {
+  // 模块路径
+  name: 'yfCostManage/basicDataSetting/projectZjtrCost',
+  res: ({ data }) => {
+    return data;
+  },
+});
+</script>