[update] 企标稽查和企标复审计划联调分页查询

src/common/lang/enterpriseStandardLibrary/en.js

@@ -98,6 +98,9 @@ module.exports = {
     enterpriseStandardName: '企标名称',
     publishDate: '发布日期',
     reviewDate: '复审日期',
-    initReview: '发起复审'
+    initReview: '发起复审',
+    reviewResult: '复审结果',
+    principalDrafter: '主起草人',
+    mainDraftingUnit: '主起草单位'
   }
 }

src/common/lang/enterpriseStandardLibrary/zh.js

@@ -98,6 +98,16 @@ module.exports = {
     enterpriseStandardName: '企标名称',
     publishDate: '发布日期',
     reviewDate: '复审日期',
-    initReview: '发起复审'
+    initReview: '发起复审',
+    reviewResult: '复审结果',
+    principalDrafter: '主起草人',
+    mainDraftingUnit: '主起草单位'
+  },
+  // 企标计划
+  plan: {
+    oldEnterpriseStandardNum: '原企标编号',
+    newEnterpriseStandardNum: '新企标编号',
+    oldEnterpriseStandardName: '原企标名称',
+    newEnterpriseStandardName: '新企标名称',
   }
 }

src/views/enterpriseStandardLibrary/check/CheckList.vue

@@ -18,8 +18,8 @@
             <a-form-item :label="$t('enterpriseStandardLibrary.check.status')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag
                 :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.check.status')"
-                dict-code=""
+                dict-code="inspect_status"
-                v-model="queryParam.standardName">
+                v-model="queryParam.inspectStatus">
               </j-dict-select-tag>
             </a-form-item>
           </a-col>
@@ -29,8 +29,8 @@
                 <a-range-picker
                   value-format="YYYY-MM-DD"
                   format="YYYY-MM-DD"
-                  @change="checkDateChange"
+                  @change="scheduledCheckDateChange"
-                  v-model="queryParam.checkDate">
+                  v-model="queryParam.scheduledCheckDate">
                 </a-range-picker>
               </a-form-item>
             </a-col>
@@ -48,7 +48,7 @@
               <a-form-item :label="$t('enterpriseStandardLibrary.check.department')">
                 <a-tree-select
                   tree-node-filter-prop="title"
-                  v-model="queryParam.departId"
+                  v-model="queryParam.inspectDept"
                   :maxTagCount="1"
                   :show-search="true"
                   :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -113,7 +113,7 @@
         </template>
 
         <!--  计划稽查日期： 到期前一周标红？？  -->
-        <template slot="scheduledCheckDate" slot-scope="text">
+        <template slot="scheduledCheckDate" slot-scope="{text}">
           <a-tooltip overlay-class-name="tooltip-style">
             <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
             <div class="table-text">{{ text || text === 0 ? text : global.emptyLine }}</div>
@@ -172,14 +172,14 @@ export default {
           title: this.$t('enterpriseStandardLibrary.check.basedStandardNo'),
           align: 'center',
           width: 180,
-          dataIndex: 'standardNo',
+          dataIndex: 'inspectNo',
           scopedSlots: { customRender: 'toDetail' }
         },
         {
           title: this.$t('enterpriseStandardLibrary.check.basedStandardName'),
           align: 'center',
           width: 180,
-          dataIndex: 'standardName',
+          dataIndex: 'inspectName',
           scopedSlots: { customRender: 'toDetail' }
         },
         {
@@ -193,63 +193,63 @@ export default {
           title: this.$t('enterpriseStandardLibrary.check.workGroup'),
           align: 'center',
           width: 180,
-          dataIndex: 'workGroup',
+          dataIndex: 'standardizationWorkGroup',
           scopedSlots: { customRender: 'text' }
         },
         {
           title: this.$t('enterpriseStandardLibrary.check.department'),
           align: 'center',
           width: 180,
-          dataIndex: 'department',
+          dataIndex: 'belongDept',
           scopedSlots: { customRender: 'text' }
         },
         {
           title: this.$t('enterpriseStandardLibrary.check.scheduledCheckDate'),
           align: 'center',
           width: 180,
-          dataIndex: 'scheduledCheckDate',
+          dataIndex: 'planInspectDate',
           scopedSlots: { customRender: 'scheduledCheckDate' }
         },
         {
           title: this.$t('enterpriseStandardLibrary.check.headOfCheck'),
           align: 'center',
           width: 180,
-          dataIndex: 'headOfCheck',
+          dataIndex: 'inspectUser',
           scopedSlots: { customRender: 'text' }
         },
         {
           title: this.$t('enterpriseStandardLibrary.check.contactPerson'),
           align: 'center',
           width: 180,
-          dataIndex: 'contactPerson',
+          dataIndex: 'standardizationDockingUser',
           scopedSlots: { customRender: 'text' }
         },
         {
           title: this.$t('enterpriseStandardLibrary.check.checkFinishDate'),
           align: 'center',
           width: 180,
-          dataIndex: 'checkFinishDate',
+          dataIndex: 'completeDate',
           scopedSlots: { customRender: 'text' }
         },
         {
           title: this.$t('enterpriseStandardLibrary.check.actualChecker'),
           align: 'center',
           width: 180,
-          dataIndex: 'actualChecker',
+          dataIndex: 'actualInspectUser',
           scopedSlots: { customRender: 'text' }
         },
         {
           title: this.$t('enterpriseStandardLibrary.check.status'),
           align: 'center',
           width: 180,
-          dataIndex: 'status',
+          dataIndex: 'inspectStatus',
           scopedSlots: { customRender: 'text' }
         },
         {
           title: this.$t('enterpriseStandardLibrary.check.createDate'),
           align: 'center',
           width: 180,
-          dataIndex: 'createDate',
+          dataIndex: 'createTime',
           scopedSlots: { customRender: 'text' }
         },
         {
@@ -280,6 +280,16 @@ export default {
         }
       })
     },
+    // 计划稽查日期改变
+    scheduledCheckDateChange (val) {
+      this.queryParam.planInspectStartDate = val[0]
+      this.queryParam.planInspectEndDate = val[1]
+    },
+    // 创建日期改变
+    createDateChange (val) {
+      this.queryParam.inspectCreateStartDate = val[0]
+      this.queryParam.inspectCreateEndDate = val[1]
+    },
     // 点击跳转企标详情
     handleGoDetail (record) {
       this.$openPageNewSheet({

src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue

@@ -81,7 +81,7 @@
         </template>
 
         <!--  复审日期： 大于当前日期时标红？？  -->
-        <template slot="reviewDate" slot-scope="text">
+        <template slot="reviewDate" slot-scope="{text}">
           <a-tooltip overlay-class-name="tooltip-style">
             <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
             <div class="table-text">{{ text || text === 0 ? text : global.emptyLine }}</div>
@@ -116,94 +116,53 @@ export default {
           }
         },
         {
-          title: this.$t('enterpriseStandardLibrary.check.basedStandardNo'),
+          title: this.$t('enterpriseStandardLibrary.reviewPlan.enterpriseStandardNum'),
           align: 'center',
           width: 180,
           dataIndex: 'standardNo',
           scopedSlots: { customRender: 'toDetail' }
         },
         {
-          title: this.$t('enterpriseStandardLibrary.check.basedStandardName'),
+          title: this.$t('enterpriseStandardLibrary.reviewPlan.enterpriseStandardName'),
           align: 'center',
           width: 180,
           dataIndex: 'standardName',
           scopedSlots: { customRender: 'toDetail' }
         },
         {
-          title: this.$t('enterpriseStandardLibrary.check.planCheckTarget'),
+          title: this.$t('enterpriseStandardLibrary.reviewPlan.publishDate'),
           align: 'center',
           width: 180,
-          dataIndex: 'planCheckTarget',
+          dataIndex: 'releaseDate',
           scopedSlots: { customRender: 'text' }
         },
         {
-          title: this.$t('enterpriseStandardLibrary.check.workGroup'),
+          title: this.$t('enterpriseStandardLibrary.reviewPlan.reviewDate'),
           align: 'center',
           width: 180,
-          dataIndex: 'workGroup',
+          dataIndex: 'recheckDate',
+          scopedSlots: { customRender: 'reviewDate' }
+        },
+        {
+          title: this.$t('enterpriseStandardLibrary.reviewPlan.reviewResult'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'recheckResult',
           scopedSlots: { customRender: 'text' }
         },
         {
-          title: this.$t('enterpriseStandardLibrary.check.department'),
+          title: this.$t('enterpriseStandardLibrary.reviewPlan.principalDrafter'),
           align: 'center',
           width: 180,
-          dataIndex: 'department',
+          dataIndex: 'mainDraftingUser',
           scopedSlots: { customRender: 'text' }
         },
         {
-          title: this.$t('enterpriseStandardLibrary.check.scheduledCheckDate'),
+          title: this.$t('enterpriseStandardLibrary.reviewPlan.mainDraftingUnit'),
           align: 'center',
           width: 180,
-          dataIndex: 'scheduledCheckDate',
+          dataIndex: 'mainDraftingUnit',
-          scopedSlots: { customRender: 'scheduledCheckDate' }
-        },
-        {
-          title: this.$t('enterpriseStandardLibrary.check.headOfCheck'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'headOfCheck',
           scopedSlots: { customRender: 'text' }
-        },
-        {
-          title: this.$t('enterpriseStandardLibrary.check.contactPerson'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'contactPerson',
-          scopedSlots: { customRender: 'text' }
-        },
-        {
-          title: this.$t('enterpriseStandardLibrary.check.checkFinishDate'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'checkFinishDate',
-          scopedSlots: { customRender: 'text' }
-        },
-        {
-          title: this.$t('enterpriseStandardLibrary.check.actualChecker'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'actualChecker',
-          scopedSlots: { customRender: 'text' }
-        },
-        {
-          title: this.$t('enterpriseStandardLibrary.check.status'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'status',
-          scopedSlots: { customRender: 'text' }
-        },
-        {
-          title: this.$t('enterpriseStandardLibrary.check.createDate'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'createDate',
-          scopedSlots: { customRender: 'text' }
-        },
-        {
-          title: this.$t('operation'),
-          scopedSlots: { customRender: 'action' },
-          align: 'center',
-          width: 200
         }
       ],
       url: {
@@ -218,7 +177,7 @@ export default {
       this.queryParam.releaseEndDate = val[1]
     },
     // 复审日期改变
-    reviewDataChange (val) {
+    reviewDateChange (val) {
       this.queryParam.recheckStartDate = val[0]
       this.queryParam.recheckEndDate = val[1]
     },