Merge branch 'dev_2nd_period_test' into fix_2nd_period

# Conflicts: # jero-boot/db/蔚来标准sql/dev_2nd_period.sql # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java # jero-web/src/common/lang/en-us.js # jero-web/src/common/lang/zh-cn.js # jero-web/src/views/projectManagement/components/TaskList.vue # jero-web/src/views/projectManagement/components/listOfRegulations.vue
2022-12-28 09:53:38 +08:00
parent 34359f65a5 de7bfab8d1
commit 4633d465f3
81 changed files with 3221 additions and 154 deletions
@@ -100,6 +100,20 @@
                </a-form-model-item>
              </div>
            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('brand')">
+                  <span class="Required">*</span>
+                  <span  class="title-text-text">{{$t('brand')}}</span>
+                </div>
+                <a-form-model-item class="itemModel propbox" prop="brands">
+                <j-multi-select-tag class="box-input" v-model="formInline.brands"
+                                    :placeholder="$t('PleaseSelect')+$t('brand')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'brand'"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
          </a-row>
        </a-form-model>
        <footerProcess
@@ -164,6 +178,13 @@
              trigger: 'change'
            }
          ],
+          brands: [
+            {
+              required: true,
+              message: this.$t('brand') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
          taskExplain: [
            {
              max: 300,
@@ -326,6 +347,11 @@
              this.$message.warning(this.$t('pleaseSelectStandard'))
            } else {
              this.JLoading = true
+              Object.keys(this.formInline).forEach(val => {
+                if (this.formInline[val] instanceof Array) {
+                  this.formInline[val] = this.formInline[val].join(',')
+                }
+              })
              let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
              value.standId = value.id
              value.taskAffirmDueDate = value.endTime
@@ -398,6 +424,9 @@
 </script>

 <style scoped>
+  /deep/.propbox .ant-form-explain{
+    margin-top: -17px !important;
+  }
  .detail-box {
    padding: 67px 0 0 0;
    background: #ffffff;
@@ -59,6 +59,17 @@
                </a-select>
              </div>
            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('brand')">
+                  <span>{{$t('brand')}}</span>
+                </div>
+                <j-multi-select-tag class="box-input" v-model="queryParam.brand"
+                                    :placeholder="$t('PleaseSelect')+$t('brand')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'brand'"/>
+              </div>
+            </a-col>
          </template>
          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
               <a-col :md="6" :sm="24">
@@ -200,6 +211,13 @@
            ellipsis: true,
            dataIndex: 'createBy'
          },
+          {
+            title: this.$t('brand'),
+            align: 'center',
+            ellipsis: true,
+            width: 140,
+            dataIndex: 'brand_text'
+          },
          {
            title: this.$t('dateOfInitiation'),
            align: 'center',
@@ -109,6 +109,10 @@
              </div>
            </div>
            <div class="content-box-button-right">
+              <div class="content-box-button-text" @click="pushJump(item)">
+                <img src="~/@assets/feishu.png" alt="" class="jumpicon">
+                {{$t('contactTheFounder')}}
+              </div>
              <div class="content-box-button-text" @click="forwardClick(item)">
                <a-icon type="logout"/>
                {{$t('forward')}}
@@ -401,6 +405,20 @@
        this.queryForm = row
        this.$refs.SelectedByRef.getPush()
      },
+      pushJump(row){
+        let query = {
+          userName: row.createBy,
+        }
+        postAction('/lark/getLarkApplinkByUserName', query).then((res) => {
+          if (res.code === 200) {
+            let url = res.result
+            window.open(url, '_blank')
+          } else {
+            this.$message.warning(res.message)
+            this.$refs.SelectedByRef.submitLoading = false
+          }
+        })
+      },
      SelectedByForm(userIds) {
        let query = {
          userIds: userIds,
@@ -436,7 +454,10 @@
    overflow: hidden;
    /*margin: 0 auto;*/
  }
-
+  .jumpicon{
+    height: 13.72px;
+    width: 15.44px;
+  }
  .box-title-text {
    line-height: 1.4;
    width: 360px;
@@ -53,6 +53,10 @@
          </div>
        </div>
        <div class="content-box-button-right">
+          <div class="content-box-button-text" @click="pushJump(queryForm)">
+            <img src="~/@assets/feishu.png" alt="" class="jumpicon">
+            {{$t('contactTheFounder')}}
+          </div>
          <div class="content-box-button-text" @click="forwardClick(queryForm)">
            <a-icon type="logout"/>
            {{$t('forward')}}
@@ -449,6 +453,20 @@
        this.queryForm = row
        this.$refs.SelectedByRef.getPush()
      },
+      pushJump(row){
+        let query = {
+          userName: row.createBy,
+        }
+        postAction('/lark/getLarkApplinkByUserName', query).then((res) => {
+          if (res.code === 200) {
+            let url = res.result
+            window.open(url, '_blank')
+          } else {
+            this.$message.warning(res.message)
+            this.$refs.SelectedByRef.submitLoading = false
+          }
+        })
+      },
      detailClick(item,key) {
        let newUrl = this.$router.resolve({
          path: '/docManage/library/detail',
@@ -481,6 +499,10 @@
 </script>

 <style scoped lang="less">
+.jumpicon{
+  height: 13.72px;
+  width: 15.44px;
+}
  .content-box {
    width: 100%;
    height: auto;
@@ -64,6 +64,23 @@
              </div>
            </a-col>
          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="8">
+              <div class="box-title-text" style="height: 60px">
+                <div class="title-text" :title="$t('brand')">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('brand')">{{$t('brand')}}</span>
+                </div>
+                <a-form-model-item class="itemModel propbox" prop="brands">
+                <j-multi-select-tag class="box-input" v-model="formInline.brands"
+                                    :placeholder="$t('PleaseSelect')+$t('brand')"
+                                    :type="'select'"
+                                    style="width: 100%"
+                                    :triggerChange="false" :dictCode="'brand'"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
          <a-row :gutter="24" style="margin-bottom: 10px">
            <a-col :span="16">
              <div class="box-title-text">
@@ -281,6 +298,13 @@
              trigger: 'change'
            }
          ],
+          brands: [
+            {
+              required: true,
+              message: this.$t('brand') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
          processBackground: [
            {
              max: 300,
@@ -676,6 +700,9 @@
  }
 </style>
 <style scoped>
+  /deep/.propbox .ant-form-explain{
+    margin-top: -17px !important;
+  }
  .detail-box {
    padding: 67px 0 0 0;
    background: #ffffff;
@@ -60,6 +60,17 @@
                </a-select>
              </div>
            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('brand')">
+                  <span>{{$t('brand')}}</span>
+                </div>
+                <j-multi-select-tag class="box-input" v-model="queryParam.brand"
+                                    :placeholder="$t('PleaseSelect')+$t('brand')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'brand'"/>
+              </div>
+            </a-col>
          </template>
          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
               <a-col :md="6" :sm="24">
@@ -269,6 +280,13 @@
            ellipsis: true,
            dataIndex: 'createBy'
          },
+          {
+            title: this.$t('brand'),
+            align: 'center',
+            ellipsis: true,
+            width: 140,
+            dataIndex: 'brand_text'
+          },
          {
            title: this.$t('dateOfInitiation'),
            align: 'center',