Merge branch 'fix_bug_first_stage'

# Conflicts: # jero-web/src/common/lang/en-us.js # jero-web/src/common/lang/zh-cn.js
2022-08-15 21:02:40 +08:00
parent 86f61423d9 169a3340b0
commit 2dec17b06a
11 changed files with 441 additions and 54 deletions
@@ -14,18 +14,18 @@
          </a-col>
          <a-col :md="6" :sm="8">
            <div class="box-title-text">
-              <div class="title-text"  :title="$t('areaOfResponsibility')">
+              <div class="title-text" :title="$t('areaOfResponsibility')">
                <span>{{$t('areaOfResponsibility')}}</span>
              </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
-                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                 :type="'select'"
-                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+              <j-multi-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'duty_territory'"/>
            </div>
          </a-col>
          <a-col :md="6" :sm="8">
            <div class="box-title-text">
-              <div class="title-text"  :title="$t('CertificationProgress')">
+              <div class="title-text" :title="$t('CertificationProgress')">
                <span>{{$t('CertificationProgress')}}</span>
              </div>
              <j-dict-select-tag class="box-input" v-model="queryParam.certificationProgress"
@@ -76,6 +76,10 @@
      </a-form>
    </div>
    <div class="table-operator">
+      <!--      <div class="operator-text" @click="batSettingClick">-->
+      <!--        <a-icon type="setting"/>-->
+      <!--        {{ $t('batSetting') }}-->
+      <!--      </div>-->
      <div @click="CertificationDirectory" class="operator-text">
        <a-icon type="bulb"/>
        {{$t('CertificationDirectory')}}
@@ -86,6 +90,8 @@
      </div>
    </div>
    <div style="width: 100%">
+      <!--        rowKey="id"
+      :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"-->
      <a-table
        ref="table"
        bordered
@@ -98,7 +104,8 @@
      >
        <div slot="standardInformation" slot-scope="text,result" class="box-left">
          <div class="content">
-            <a class="box-content-a" @click="standardClick(result)" :title="result.serialNumber">{{result.serialNumber}}</a>
+            <a class="box-content-a" @click="standardClick(result)"
+               :title="result.serialNumber">{{result.serialNumber}}</a>
            <a class="box-content-buttom" :title="result.title">{{result.title}}</a>
          </div>
        </div>
@@ -170,12 +177,14 @@
    </div>
    <certificationDirectory :isDisplayNum="isDisplayNum" :url="url" ref="certificationDirectoryRef"/>
    <TaskListModel @TaskListModelList="TaskListModelList" ref="TaskListModelRef"/>
+    <taskBatSetting @taskBatSettingForm="taskBatSettingForm" ref="taskBatSettingRef"></taskBatSetting>
  </a-card>
 </template>

 <script>
  import certificationDirectory from './certificationDirectory'
  import TaskListModel from './TaskListModel'
+  import taskBatSetting from './taskBatSetting'
  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
  import { mapGetters } from 'vuex'
  import store from '@/store/'
@@ -184,7 +193,8 @@
    name: 'TaskList',
    components: {
      certificationDirectory,
-      TaskListModel
+      TaskListModel,
+      taskBatSetting
    },
    props: ['isDisplayNum', 'areaOfResponsibility'],
    data() {
@@ -332,8 +342,18 @@
        this.queryParam = {}
        this.getList()
      },
-      onSelectChange() {
-
+      batSettingClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.$refs.taskBatSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      taskBatSettingForm() {
+        this.getList()
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
      },
      handleExport() {
        let query = {
@@ -364,7 +384,7 @@
              DueDate: 'designDueDate',
              remarks: 'designRemark',
              projectName: this.$route.query.projectName,
-              targetMarket:this.$route.query.targetMarket,
+              targetMarket: this.$route.query.targetMarket,
              projectNameId: this.$route.query.projectNameId,
              primaryKeyId: val.designTaskDetailId,
              PersonChargeFeedback: val.designPersonChargeFeedback
@@ -389,7 +409,7 @@
              DueDate: 'prehomoDueDate',
              remarks: 'prehomoRemark',
              projectName: this.$route.query.projectName,
-              targetMarket:this.$route.query.targetMarket,
+              targetMarket: this.$route.query.targetMarket,
              projectNameId: this.$route.query.projectNameId,
              primaryKeyId: val.prehomoTaskDetailId,
              PersonChargeFeedback: val.prehomoPersonChargeFeedback
@@ -414,7 +434,7 @@
              DueDate: 'verifyDueDate',
              remarks: 'verifyRemark',
              projectName: this.$route.query.projectName,
-              targetMarket:this.$route.query.targetMarket,
+              targetMarket: this.$route.query.targetMarket,
              projectNameId: this.$route.query.projectNameId,
              primaryKeyId: val.verifyTaskDetailId,
              PersonChargeFeedback: val.verifyPersonChargeFeedback
@@ -431,9 +451,15 @@
        this.$refs.certificationDirectoryRef.addModel()
      },
      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
        let query = {
          projectLibraryId: this.$route.query.id,
-          ...this.queryParam
+          ...queryParam
        }
        this.loading = true
        getAction(this.url.list, query).then((res) => {
@@ -458,15 +484,15 @@
      TaskListModelList() {
        this.getList()
      },
-      standardClick(row){
+      standardClick(row) {
        let newUrl = this.$router.resolve({
          path: '/docManage/library/detail',
          query: {
-            id:row.standId
+            id: row.standId
          }
        })
        window.open(newUrl.href, '_blank')
-      },
+      }
    }
  }
 </script>
@@ -659,7 +685,8 @@
  .box-content-cou {
    cursor: pointer;
  }
-  .box-content-buttom{
+
+  .box-content-buttom {
    width: 100%;
    overflow: hidden;
    display: -webkit-box;
@@ -215,6 +215,13 @@
        })
      },
      handleOk() {
+        if (this.formInline.dutyTerritory) {
+          this.handleOkTwo()
+        } else {
+          this.handleOkOne()
+        }
+      },
+      handleOkOne() {
        let ids = JSON.parse(JSON.stringify(this.ids))
        let query = {
          ids: ids.join(','),
@@ -233,6 +240,31 @@
          }
        })
      },
+      handleOkTwo() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('areResponsibilityAreaInformationBatch'),
+          onOk() {
+            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
@@ -838,8 +838,8 @@
        rulesData: {
          subtitle: [
            {
-              max: 100,
-              message: this.$t('subtitle') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              max: 300,
+              message: this.$t('subtitle') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
              trigger: 'blur'
            }
          ],
@@ -29,10 +29,10 @@
              <div class="title-text" :title="$t('areaOfResponsibility')">
                <span>{{ $t('areaOfResponsibility') }}</span>
              </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
-                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                 :type="'select'"
-                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+              <j-multi-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'duty_territory'"/>
            </div>
          </a-col>
          <a-col :md="6" :sm="8">
@@ -200,7 +200,7 @@
        class="tableList"
        :loading="loading"
        :pagination="false"
-        :scroll="{x: '100%',y:'calc(100vh - 170px)'}"
+        :scroll="{x: '100%',y:'calc(100vh - 186px)'}"
        rowKey="id"
        :data-source="dataSource"
        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -273,6 +273,9 @@
           <span v-else>--</span>
        </span>
      </a-table>
+      <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
+        {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}
+      </div>
    </div>
    <listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
    <listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
@@ -1386,9 +1389,15 @@
        if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') {
          roleCode = 0
        }
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
        let query = {
          ...this.queryParamQuery,
-          ...this.queryParam,
+          ...queryParam,
          projectLibraryId: this.$route.query.id,
          roleCode: roleCode
        }
@@ -2257,6 +2266,14 @@
    text-justify: inter-ideograph;
    word-break: break-all
  }
+
+  .buttom-box {
+    width: 100%;
+    text-align: right;
+    font-size: 16px;
+    font-weight: 500;
+    color: #000F16;
+  }
 </style>
 <style>
  .box-input .ant-select-selection {
@@ -0,0 +1,251 @@
+<template>
+  <a-modal
+    :title="$t('batSetting')"
+    :width="600"
+    :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="24">
+          <div class="box-title-text">
+            <div class="title-text">
+                      <span class="title-text-text"
+                            :title="$t('CertificationProgress')">{{$t('CertificationProgress')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <j-dict-select-tag class="box-input" v-model="formInline.certificationProgress"
+                                 @input="handleInput('certificationProgress')"
+                                 :placeholder="$t('PleaseSelect')+$t('CertificationProgress')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'certification_progress'"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text"
+                    :title="$t('CurrentStatus')">{{$t('CurrentStatus')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="conditionAssessment">
+              <a-select
+                v-model="formInline.conditionAssessment"
+                :placeholder="$t('PleaseSelect')+$t('CurrentProjectStatusEvaluation')">
+                <a-select-option :value="'1'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('red') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'2'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('yellow') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'3'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('green') }}
+                             </span>
+                </a-select-option>
+
+                <a-select-option :value="'4'" disabled>
+                               <span style="display: inline-block;width: 100%">
+                                     {{ $t('blue') }}
+                                </span>
+                </a-select-option>
+              </a-select>
+            </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: 'taskBatSetting',
+    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() {
+        if (this.formInline.dutyTerritory) {
+          this.handleOkTwo()
+        } else {
+          this.handleOkOne()
+        }
+      },
+      handleOkOne() {
+        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
+          }
+        })
+      },
+      handleOkTwo() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('areResponsibilityAreaInformationBatch'),
+          onOk() {
+            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])
+        })
+      },
+    }
+  }
+</script>
+
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }
+
+  /*.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;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    padding: 4px 30px 4px 11px;
+  }
+</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>