From 38e8f211d6dfdbb5076950fef0c4e189d97d656d Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 2 Nov 2022 09:16:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=82=AC=E5=8A=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   1 +
 jero-web/src/common/lang/zh-cn.js             |   1 +
 .../projectManagement/components/TaskList.vue |  24 ++-
 .../components/cuibanModel.vue                | 188 ++++++++++++++++++
 4 files changed, 209 insertions(+), 5 deletions(-)
 create mode 100644 jero-web/src/views/projectManagement/components/cuibanModel.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index fb1b870a0..146157a4d 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1329,4 +1329,5 @@ module.exports = {
   thereForTheCurrentlySelectedData:'There is no standard breakdown for the currently selected data',
   secondaryDirectory:'Secondary Directory',
   OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected',
+  CuiBan:'CuiBan',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index eb5e9af9a..1124ee14d 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1430,4 +1430,5 @@ module.exports = {
   thereForTheCurrentlySelectedData:'当前所选数据暂无标准分解单',
   secondaryDirectory:'二级目录',
   OnlyPersonsCanBeSelected:'超出最大上限；最多只能选择100个人员',
+  CuiBan:'催办',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 5e0142614..98dbb5eee 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -76,10 +76,10 @@
       </a-form>
     </div>
     <div class="table-operator">
-<!--      <div class="operator-text" @click="batSettingClick">-->
-<!--        <a-icon type="setting"/>-->
-<!--        {{ $t('batSetting') }}-->
-<!--      </div>-->
+      <div class="operator-text" @click="cuibanClick">
+        <a-icon type="sound"/>
+        {{ $t('CuiBan') }}
+      </div>
       <div @click="BatchMaintenanceProgress" class="operator-text">
         <a-icon type="setting"/>
         {{$t('BatchMaintenanceProgress')}}
@@ -189,6 +189,7 @@
     <TaskListModel @TaskListModelList="TaskListModelList" ref="TaskListModelRef"/>
     <taskBatSetting @taskBatSettingForm="taskBatSettingForm" ref="taskBatSettingRef"></taskBatSetting>
     <batchChangeModel @batchChangeModel="batchChangeModel" ref="batchChangeModelRef"/>
+    <cuibanModel @cibanModel="cibanModel" ref="cModelRef"/>
     <batchModel @batchModel="batchModel" ref="batchModelRef"/>
     <!--    错误数据提示-->
     <a-modal
@@ -221,6 +222,7 @@
   import batchChangeModel from './batchChangeModel'
   import batchModel from './batchModel'
   import TaskListModel from './TaskListModel'
+  import cuibanModel from './cuibanModel'
   import taskBatSetting from './taskBatSetting'
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import { mapGetters } from 'vuex'
@@ -233,7 +235,8 @@
       TaskListModel,
       batchChangeModel,
       batchModel,
-      taskBatSetting
+      taskBatSetting,
+      cuibanModel,
     },
     props: ['isDisplayNum', 'areaOfResponsibility'],
     data() {
@@ -604,6 +607,17 @@
         }
 
       },
+      // 催办
+      cuibanClick(){
+        if(this.selectionRowsArray.length <1){
+          this.$message.warning(this.$t('selectLeastOne'))
+        }else{
+          this.$refs.cModelRef.getData(this.selectionRowsArray)
+        }
+      },
+      cibanModel(){
+        this.getList()
+      },
       cancleoperationFailed(){
         this.visibleoperationFailed = false
       },
diff --git a/jero-web/src/views/projectManagement/components/cuibanModel.vue b/jero-web/src/views/projectManagement/components/cuibanModel.vue
new file mode 100644
index 000000000..af5c8550b
--- /dev/null
+++ b/jero-web/src/views/projectManagement/components/cuibanModel.vue
@@ -0,0 +1,188 @@
+<!--催办-->
+<template>
+  <a-modal
+    :title="title"
+    :width="700"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="visible = false"
+  >
+    <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>
+<!--            mode="multiple"-->
+            <a-form-model-item class="itemModel" prop="type">
+                <a-select v-model="formInline.type"
+                          class='box-input'
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear>
+                  <a-select-option v-for="(item, key) in cuibanList" :key="key" :value="item.value">
+                      <span style="display: inline-block;width: 100%" :title=" item.label ">
+                        {{ item.label }}
+                      </span>
+                  </a-select-option>
+                </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+import { postAction, putAction, getAction } from '@/api/manage'
+
+export default {
+  name: 'TaskListModel',
+  data() {
+    return {
+      formInline: {},
+      selectionRowsArray:[],
+      rules: {
+        type: [
+          {
+            required: true,
+            message: this.$t('PleaseSelect') + this.$t('CertificationProgress'),
+            trigger: 'change'
+          }
+          ]
+      },
+      title:'',
+      visible: false,
+      confirmLoading: false,
+      studioList: [],
+      cuibanList:[
+        { label: this.$t('confirmationOfDesignConformity'), value: '2' },
+        { label: this.$t('PrehomoConfirmation'), value: '3' },
+        { label: this.$t('verificationAndConformityconfirmation'), value: '4' },
+      ],
+      ids:'',
+      disabled: false,
+      url: {
+        edit: '/project/projectTaskInventoryEO/edit',
+        addOrUpdate: '/project/projectTaskInventoryConditionAssessmentEO/addOrUpdate',
+        list: '/project/projectTaskInventoryConditionAssessmentEO/list'
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    getData(val) {
+      this.visible = true
+      this.title = this.$t('CuiBan')
+      this.selectionRowsArray = val
+      this.$nextTick(() => {
+        this.formInline = {}
+        this.$refs.ruleForm.clearValidate()
+      })
+    },
+    getList(val) {
+      getAction(this.url.list, { projectLawsInventoryId: val.projectLawsInventoryId }).then((res) => {
+        if (res.success) {
+          this.studioList = res.result || []
+        } else {
+          this.studioList = []
+        }
+      })
+    },
+    handleInput(value) {
+      this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.validateField([value])
+      })
+    },
+    handleOk() {
+      if (this.disabled) {
+        this.visible = false
+        return
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          let ProjectTaskUrgVo = {}
+          let projectLawsInventoryId = []
+          this.selectionRowsArray.forEach((item) => {
+            if(item.projectLawsInventoryId){
+              projectLawsInventoryId.push(item.projectLawsInventoryId)
+            }
+          })
+          ProjectTaskUrgVo = {
+              projectLawsInventoryIds: projectLawsInventoryId.join(','),
+              type: this.formInline.type
+            }
+          this.confirmLoading = true
+          postAction('/project/projectLawsInventoryEO/taskUrg', ProjectTaskUrgVo).then((res) => {
+            if (res.success) {
+              this.visible = false
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$emit('cibanModel')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text {
+  width: 134px;
+  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;
+}
+
+.headerText {
+  margin-left: 30px;
+  color: #040B29;
+  font-weight: 400;
+}
+</style>
\ No newline at end of file

From 67b18a48a42413953aaf9d118300f8a354c3a62c Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 2 Nov 2022 19:53:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0-=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOController.java          | 15 +++++++++++++++
 .../components/RetrieveFilesList.vue              |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
index 4227e3341..e2864dc65 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
@@ -90,6 +90,21 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 		 return Result.OK(infoPage);
 	 }
 
+	 /**
+	  * 文档翻译调取已入库文件
+	  * @param parameter
+	  * @return
+	  */
+	 @AutoLog(value = "文档翻译调取已入库文件")
+	 @ApiOperation(value="文档翻译调取已入库文件", notes="文档翻译调取已入库文件")
+	 @PostMapping(value = "/transPageInfo")
+	 @ResponseBody
+     @RequiresPermissions("documentTranslation:retrieval")
+	 public Result<?> transPageInfo(@RequestBody Map<String,Object> parameter) {
+		 IPage infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter);
+		 return Result.OK(infoPage);
+	 }
+
     /**
 	 * 列表查询
 	 *
diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
index 4f8a942ee..69a95a94e 100644
--- a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
@@ -223,7 +223,7 @@
           ...this.queryParam
         }
         this.loading = true
-        postAction('document/bussDocumentLibraryEO/ocrPageInfo', query).then((res) => {
+        postAction('document/bussDocumentLibraryEO/transPageInfo', query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.total = res.result.total

From bed54d7869f4ca18171d7d8505d717111489efa1 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 3 Nov 2022 09:52:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=20=E6=8E=A7=E4=BB=B6=E5=A4=87?=
 =?UTF-8?q?=E9=80=89=E5=80=BC=E4=B8=8D=E8=83=BD=E8=BE=93=E5=85=A5=EF=BC=81?=
 =?UTF-8?q?=E5=92=8C#?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parameter/parameterlist/components/addModel.vue      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index 5eb433eda..9fe7a3502 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -415,6 +415,7 @@ export default {
         controlValues: [
           { required: true, message: this.$t('PleaseEnter')+this.$t('controlAlternatives'), trigger: 'blur' },
           { min:1, max: 500, message: this.$t('cantExeed')+'500'+this.$t('characters'), trigger: 'blur' },
+          { validator: this.test }
         ],
         titleDefaultValue: [
           { required: true, message: this.$t('PleaseEnter')+this.$t('DefaultValue'), trigger: 'blur' },
@@ -452,6 +453,14 @@ export default {
     }
   },
   methods: {
+    test(rule, value, callback) {
+      var money = /^[^##！!]*$/
+      if (money.test(value)) {
+        callback()
+      } else {
+        callback(new Error(this.$t('disableInput') + '!#'))
+      }
+    },
     getcontentListedEdit() {
       getAction('sys/dict/getDictItems/cert_category', { }).then((res) => {
         if (res.success) {