Explorar el Código

委托外部信息台账页面开发

ljb hace 10 meses
padre
commit
ac0a2d23c9

+ 5 - 0
src/option/yfCostManage/basicDataSetting/otherCostLedger.js

@@ -84,6 +84,11 @@ export default {
       label: '费用内容',
       prop: 'fynr',
       type: 'select',
+      dicData: [],
+      props: {
+        label: 'name',
+        value: 'id'
+      },
       span: 24,
       minWidth: 160,
       showOverflowTooltip: true,

+ 105 - 20
src/option/yfCostManage/basicDataSetting/wwCostLedger.js

@@ -26,7 +26,6 @@ export default {
       prop: 'xmbh',
       type: 'input',
       span: 24,
-      search: true,
       width: 100,
       align: 'center',
       showOverflowTooltip: true,
@@ -59,23 +58,11 @@ export default {
     {
       label: '费用类型',
       prop: 'type',
-      type: 'select',
       span: 24,
-      minWidth: 260,
-      search: true,
-      dicUrl: '/api/kd-system/dict-biz/dictionary?code=zhitoufeiyong_lx',
-      props: {
-        label: 'dictValue',
-        value: 'dictKey',
-      },
+      width: 100,
+      align: 'center',
+      display: false,
       showOverflowTooltip: true,
-      rules: [
-        {
-          required: true,
-          message: '请选择费用类型',
-          trigger: 'blur',
-        },
-      ],
     },
     {
       label: '日期',
@@ -83,27 +70,125 @@ export default {
       type: 'date',
       valueFormat: 'yyyy-MM-dd',
       span: 24,
-      width: 100,
+      width: 90,
       align: 'center',
       search: true,
       showOverflowTooltip: true,
+      rules: [{
+        required: true,
+        message: '请选择日期',
+        trigger: 'blur'
+      }]
+    },
+    {
+      label: '受托方全称',
+      prop: 'stfqcId',
+      type: 'select',
+      dicData: [],
+      props: {
+        label: 'stfqc',
+        value: 'id'
+      },
+      span: 24,
+      width: 140,
+      hide: true,
+      showOverflowTooltip: true,
+      rules: [{
+        required: true,
+        message: '请选择受托方全称',
+        trigger: 'blur'
+      }]
     },
     {
       label: '受托方全称',
       prop: 'stfqc',
       span: 24,
-      width: 120,
+      width: 140,
+      display: false,
+      showOverflowTooltip: true,
+    },
+    {
+      label: '受托方类型',
+      prop: 'stflx',
+      span: 24,
+      type: 'select',
+      width: 100,
+      align: 'center',
+      dicUrl: '/api/kd-system/dict-biz/dictionary?code=trustee_type',
+      props: {
+        label: 'dictValue',
+        value: 'dictKey',
+      },
+      display: false,
+      search: true,
+      showOverflowTooltip: true,
+    },
+    {
+      label: '合同名称',
+      prop: 'htmc',
+      width: 110,
+      span: 24,
+      display: false,
       showOverflowTooltip: true,
     },
     {
-      label: '单价(元)',
-      prop: 'amount',
+      label: '委外费用金额(元)',
+      prop: 'wwje',
+      width: 100,
+      align: 'center',
+      span: 24,
       type: 'number',
+      min: 0,
+      precision: 2,
+      showOverflowTooltip: true,
+      rules: [{
+        required: true,
+        message: '请输入委外费用金额',
+        trigger: 'blur'
+      }]
+    },
+    {
+      label: '是否完成技术合同登记',
+      prop: 'sfwcjshtdj',
+      width: 100,
+      align: 'center',
       span: 24,
+      type: 'select',
+      dicUrl: '/api/kd-system/dict-biz/dictionary?code=yes_or_no',
+      props: {
+        label: 'dictValue',
+        value: 'dictKey',
+      },
+      display: false,
+      search: true,
+      showOverflowTooltip: true,
+    },
+    {
+      label: '技术合同类型',
+      prop: 'jshtdjlx',
       width: 100,
       align: 'center',
+      span: 24,
+      type: 'select',
+      dicUrl: '/api/kd-system/dict-biz/dictionary?code=contract_registration_type',
+      props: {
+        label: 'dictValue',
+        value: 'dictKey',
+      },
+      display: false,
+      search: true,
+      showOverflowTooltip: true,
+    },
+    {
+      label: '技术合同登记金额(万元)',
+      prop: 'jshtdjje',
+      width: 130,
+      align: 'center',
+      span: 24,
+      type: 'number',
       min: 0,
       precision: 2,
+      display: false,
       showOverflowTooltip: true,
     },
   ],

+ 1 - 1
src/views/project-manage/components/outsourcing-doc.vue

@@ -124,7 +124,7 @@ export default {
             span: 24,
             rules: [{
               required: true,
-              message: "请输入受头发全称",
+              message: "请输入受托方全称",
               trigger: "blur"
             }]
           },

+ 14 - 0
src/views/yf-cost-manage/basic-data-setting/other-cost-ledger.vue

@@ -77,6 +77,7 @@
 </template>
 
 <script>
+import { getList as getSubjectTreeList } from "@/api/basicResource/subjectSetting";
 import YearMonthSelect from "@/components/year-month-select";
 import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
@@ -124,8 +125,21 @@ export default window.$crudCommon({
       };
     },
   },
+  mounted() {
+    this.getSubjectList();
+  },
   methods: {
     loadData() {},
+    getSubjectList() {
+      getSubjectTreeList({ code: '53010108' }).then(res => {
+        this.loading = false;
+        if (res.data.code == 200) {
+          const data = res.data.data || [];
+          const column = this.findObject(this.option.column, "fynr");
+          column.dicData = data.length ? data[0].children : [];
+        }
+      })
+    },
     getFormData() {
       return { ...this.form, yearAndMonth: this.params.yearAndMonth };
     },

+ 16 - 13
src/views/yf-cost-manage/basic-data-setting/ww-cost-ledger.vue

@@ -44,19 +44,6 @@
         </div>
       </template>
 
-      <template slot="rqSearch">
-        <el-date-picker
-          v-model="params.rq"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          value-format="yyyy-MM-dd"
-          style="width: 220px !important;"
-        >
-        </el-date-picker>
-      </template>
-
       <template slot="xmIdForm">
         <project-select placeholder="请选择项目名称" v-model="form.xmId" :params="{ yearAndMonth: params.yearAndMonth }" @change="handleProjectChange"></project-select>
       </template>
@@ -77,6 +64,7 @@
 </template>
 
 <script>
+import { getList as getOutsourcingList } from "@/api/projectManage/outsourcingDoc";
 import YearMonthSelect from "@/components/year-month-select";
 import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
@@ -113,6 +101,10 @@ export default window.$crudCommon({
       }
       this.page.currentPage = 1;
       this.getList(this.page);
+    },
+    'form.xmId'(newVal) {
+      this.form.stfqcId = '';
+      this.getOutsourcingListFunc(newVal);
     }
   },
   computed: {
@@ -126,6 +118,17 @@ export default window.$crudCommon({
   },
   methods: {
     loadData() {},
+    getOutsourcingListFunc(xmId) {
+      if (!xmId) {
+        return;
+      }
+      getOutsourcingList(1, 99999, { xmId, yearAndMonth: moment(this.params.yearAndMonth).format('YYYY') }).then(res => {
+        if (res.data.code == 200) {
+          const column = this.findObject(this.option.column, "stfqcId");
+          column.dicData = res.data.data.records;
+        }
+      });
+    },
     getFormData() {
       return { ...this.form, yearAndMonth: this.params.yearAndMonth };
     },