Merge remote-tracking branch 'origin/master'

2022-04-19 18:01:21 +08:00
parent 640d70e6de e50497db16
commit e7e69a1a2f
18 changed files with 492 additions and 228 deletions
@@ -682,4 +682,7 @@ module.exports = {
  taskList:'Task list',
  TaskParameterCollection:'Task parameter collection',
  nonConformance:'Non conformance',
+  deadlineForConfirmationOfDesignCompliance:'Deadline for confirmation of design compliance',
+  prehomoConfirmationDeadline:'Prehomo confirmation deadline',
+  verificationComplianceConfirmationDeadline:'Verification compliance confirmation deadline',
 }
@@ -686,4 +686,7 @@ module.exports = {
  taskList:'任务清单',
  TaskParameterCollection:'任务参数收集',
  nonConformance:'未符合项',
+  deadlineForConfirmationOfDesignCompliance:'设计符合性确认截止时间',
+  prehomoConfirmationDeadline:'PreHomo确认截止时间',
+  verificationComplianceConfirmationDeadline:'验证符合性确认截止时间',
 }
@@ -8,16 +8,18 @@
              <span>{{$t('standard')}}</span>
            </div>
            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                     v-model="queryParam.standard"></a-input>
+                     v-model="queryParam.serialNumber"></a-input>
          </div>
        </a-col>
        <a-col :md="6" :sm="8">
          <div class="box-title-text">
-            <div class="title-text" :title="$t('areaOfResponsibility')">
+            <div class="title-text" style="width: 64px" :title="$t('areaOfResponsibility')">
              <span>{{$t('areaOfResponsibility')}}</span>
            </div>
-            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('areaOfResponsibility')"
-                     v-model="queryParam.title"></a-input>
+            <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                               :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="'region'"/>
          </div>
        </a-col>
        <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -164,7 +166,7 @@
            align: 'center',
            dataIndex: 'CurrentProjectStatusEvaluation',
            scopedSlots: { customRender: 'CurrentProjectStatusEvaluation' }
-          },
+          }
        ],
        selectedRowKeys: [],
        queryParam: {},
@@ -188,9 +190,9 @@
      handleExport() {

      },
-      CertificationDirectory(){
+      CertificationDirectory() {

-      },
+      }
    }
  }
 </script>
@@ -198,66 +200,6 @@
 <style lang="less" scoped>
  @import '~@assets/less/common.less';

-  .doc-detail {
-    background: #fff;
-    height: 100%;
-
-    .Virtual-detail-header {
-      width: 100%;
-      height: 68px;
-      line-height: 68px;
-      padding: 0 32px 0 32px;
-      box-sizing: border-box;
-      display: flex;
-      justify-content: space-between;
-      border-bottom: 2px #eff1f3 solid;
-      background: #fff;
-
-      .Virtual-detail-title {
-        display: inline-block;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
-        font-size: 20px;
-        font-weight: 400;
-        color: #040B29;
-        line-height: 68px;
-      }
-
-      .doc-detail-right {
-        width: 800px;
-        line-height: 68px;
-        display: flex;
-      }
-    }
-
-    .Virtual-detail-content {
-      padding: 0 38px 0 38px;
-      box-sizing: border-box;
-      font-size: 16px;
-
-      .box-title-text-add {
-        line-height: 1.4;
-      }
-
-      .title-text-add {
-        display: inline-block;
-        font-weight: 500;
-        margin-right: 16px;
-        height: 42px;
-        line-height: 42px;
-      }
-    }
-  }
-
-  .header-text {
-    font-size: 16px;
-    font-weight: 400;
-    height: 60px;
-    color: #000F16;
-    line-height: 40px;
-  }
-
  .box-title-text {
    line-height: 1.4;
    display: flex;
@@ -266,8 +208,7 @@
  }

  .title-text {
-    width: 20%;
-    min-width: 110px;
+    width: 32px;
    color: #000F16;
    display: inline-block;
    font-weight: 500;
@@ -0,0 +1,276 @@
+<template>
+  <a-modal
+    :title="$t('batSetting')"
+    :width="900"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text"
+                    :title="$t('implementationCategory')">{{$t('implementationCategory')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <j-dict-select-tag class="box-input" v-model="formInline.implementType"
+                                 @input="handleInput('implementType')"
+                                 :placeholder="$t('PleaseSelect')+$t('implementationCategory')"
+                                 :type="'select'"
+                                 :triggerChange="false" dictCode="implement_type"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('certificationType')">{{$t('certificationType')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <j-dict-select-tag class="box-input" v-model="formInline.attestationType"
+                                 @input="handleInput('attestationType')"
+                                 :placeholder="$t('PleaseSelect')+$t('certificationType')"
+                                 :type="'select'"
+                                 :triggerChange="false" dictCode="attestation_type"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"
+                                 @input="handleInput('attestationRank')"
+                                 :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
+                                 :type="'select'"
+                                 :triggerChange="false" dictCode="attestation_rank"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                 @input="handleInput('dutyTerritory')"
+                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                 :type="'select'"
+                                 :triggerChange="false" dictCode="duty_territory"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('deadlineForConfirmationOfDesignCompliance')">
+                {{$t('deadlineForConfirmationOfDesignCompliance')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('deadlineForConfirmationOfDesignCompliance')"
+                             @change="dateChange({db_field_name:'designDueDate'})"
+                             format="YYYY-MM-DD"
+                             v-model="formInline.designDueDate"
+                             :disabled="false"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('prehomoConfirmationDeadline')">
+                {{$t('prehomoConfirmationDeadline')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('prehomoConfirmationDeadline')"
+                             @change="dateChange({db_field_name:'prehomoDueDate'})"
+                             format="YYYY-MM-DD"
+                             v-model="formInline.prehomoDueDate"
+                             :disabled="false"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('verificationComplianceConfirmationDeadline')">
+                {{$t('verificationComplianceConfirmationDeadline')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('verificationComplianceConfirmationDeadline')"
+                             @change="dateChange({db_field_name:'verifyDueDate'})"
+                             format="YYYY-MM-DD"
+                             v-model="formInline.verifyDueDate"
+                             :disabled="false"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import moment from 'moment'
+
+  export default {
+    name: 'batSetting',
+    props: ['url'],
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        formInline: {},
+        rules: {},
+        ids: []
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      edit(data) {
+        this.visible = true
+        this.$nextTick(() => {
+          this.ids = data || []
+          this.formInline = {}
+        })
+      },
+      handleOk() {
+        let ids = JSON.parse(JSON.stringify(this.ids))
+        let query = {
+          ids: ids.join(','),
+          ...this.formInline
+        }
+        this.confirmLoading = true
+        postAction(this.url.setBatch, query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.confirmLoading = false
+            this.$emit('batSettingList')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
+      },
+      handleCancel() {
+        this.formInline = {}
+        this.visible = false
+      },
+      handleInput(value) {
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.validateField([value])
+        })
+      },
+      dateChange(item) {
+        this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+      }
+    }
+  }
+</script>
+
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: calc(100% - 130px);
+  }
+
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 84px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+</style>
@@ -198,8 +198,8 @@
                  <a-select-option v-for="(item, key) in regulatoryEngineerList"
                                   :key="key"
                                   :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
-                           {{ item.text || item.label }}
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
                     </span>
                  </a-select-option>
                </a-select>
@@ -218,11 +218,11 @@
                <a-select :placeholder="$t('PleaseSelect')+$t('certifiedEngineer')"
                          :disabled="formInline.roleCode == 0 ? false : true"
                          v-model="formInline.homologationEngineerId">
-                  <a-select-option v-for="(item, key) in regulatoryEngineerList"
+                  <a-select-option v-for="(item, key) in certificationEngineerList"
                                   :key="key"
                                   :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
-                           {{ item.text || item.label }}
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name}}
                     </span>
                  </a-select-option>
                </a-select>
@@ -239,11 +239,11 @@
                <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
                          :disabled="formInline.roleCode == 0 ? false : true"
                          v-model="formInline.engineeringInterfacePerson">
-                  <a-select-option v-for="(item, key) in regulatoryEngineerList"
+                  <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
                                   :key="key"
                                   :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
-                           {{ item.text || item.label }}
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
                     </span>
                  </a-select-option>
                </a-select>
@@ -569,14 +569,30 @@
        rules: {},
        formInline: {},
        regulatoryEngineerList: [],
+        engineeringInterfacePersonList: [],
+        certificationEngineerList: [],
        disabled: false
      }
    },
    mounted() {
    },
    methods: {
+      queryPersonByProject(row) {
+        let query = {
+          projectId: this.$route.query.id,
+          dutyTerritory: row.dutyTerritory
+        }
+        getAction(this.url.queryPersonByProject, query).then((res) => {
+          if (res.success) {
+            this.regulatoryEngineerList = res.result.lawEngineerList
+            this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList
+            this.certificationEngineerList = res.result.certificationEngineerList
+          }
+        })
+      },
      editModel(item) {
        this.visible = true
+        this.queryPersonByProject(item)
        this.$nextTick(() => {
          this.rules = {}
          this.formInline = item
@@ -680,7 +696,7 @@
      },
      handleSubmit() {
        this.$refs.ruleForm.validate(valid => {
-          if (valid){
+          if (valid) {
            let formInline = JSON.parse(JSON.stringify(this.formInline))
            Object.keys(formInline).forEach(res => {
              if (formInline[res] && formInline[res] instanceof Array) {
@@ -163,6 +163,7 @@
    </div>
    <listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
    <listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
+    <batSetting :url="url" @batSettingList="addModelList" ref="batSettingRef"/>
    <a-modal
      :title="$t('ListConfirmationDeadline')"
      :width="500"
@@ -227,6 +228,7 @@
  import ImportFile from '@/components/ImportFile/index'
  import listAddModel from './listAddModel'
  import listEditModel from './listEditModel'
+  import batSetting from './batSetting'
  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
  import moment from 'moment'
  import { mapGetters } from 'vuex'
@@ -237,7 +239,8 @@
    components: {
      ImportFile,
      listAddModel,
-      listEditModel
+      listEditModel,
+      batSetting
    },
    data() {
      return {
@@ -484,7 +487,9 @@
          deleteBatch: '/project/projectLawsInventoryEO/deleteBatch',
          deleteOne: '/project/projectLawsInventoryEO/delete',
          updateStatusBatch: '/project/projectLawsInventoryEO/updateStatusBatch',
-          matchRelevantPeople: '/project/projectLawsInventoryEO/matchRelevantPeople'
+          matchRelevantPeople: '/project/projectLawsInventoryEO/matchRelevantPeople',
+          queryPersonByProject: '/project/projectRelatedPersonnel/queryPersonByProjectId',
+          setBatch: ''
        },
        loading: false,
        dataSource: []
@@ -511,7 +516,11 @@

      },
      batSettingClick() {
-
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
      },
      handleAdd() {
        this.$refs.addModelRef.addModel()
@@ -69,6 +69,7 @@
                </div>
                <a-form-model-item class="itemModel" prop="dutyTerritory">
                  <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                      :disabled="true"
                                      :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                      :type="'select'"
                                      :triggerChange="false" :dictCode="'duty_territory'"/>