From f85b94a84e8d42320fe84a00a115aa7ff14dc899 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Sat, 7 May 2022 16:40:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  3 +-
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../virtualList/components/batSetting.vue     | 62 ++++++++++++++++++-
 .../components/listOfRegulations.vue          | 55 +++++++++++++++-
 4 files changed, 116 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 95fbb89a9..e6ac0470d 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -786,5 +786,6 @@ module.exports = {
   green: 'green',
   red: 'red',
   blue: 'blue',
-  yellow: 'yellow'
+  yellow: 'yellow',
+  resultReported:'Result Reported',
 }
\ 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 48ca70d70..386249c0e 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -792,4 +792,5 @@ module.exports = {
   red:'红',
   blue:'蓝',
   yellow:'黄',
+  resultReported:'结果报告',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue
index ee2d51f50..d9d2bd769 100644
--- a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue
@@ -67,6 +67,54 @@
             </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('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="region">
+              <j-multi-select-tag class="box-input" v-model="formInline.region"
+                                  :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'region'"/>
+            </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('scopeOfApplication')">{{$t('scopeOfApplication')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <j-multi-select-tag class="box-input" v-model="formInline.shi4Yong4Fan4Wei2"
+                                  @input="handleInput('shi4Yong4Fan4Wei2')"
+                                  :placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'apply_scope'"/>
+            </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('technicalField')">{{$t('technicalField')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="technologyTerritory">
+              <a-tree-select
+                v-model="formInline.technologyTerritory"
+                :maxTagCount="1"
+                class="box-input"
+                style="width: 100%"
+                :tree-data="CategoryTreeList"
+                tree-checkable
+                :placeholder="$t('PleaseSelect')+$t('technicalField')"
+              />
+            </a-form-model-item>
+          </div>
+        </a-col>
       </a-row>
     </a-form-model>
   </a-modal>
@@ -84,14 +132,26 @@
         confirmLoading: false,
         formInline: {},
         rules: {},
-        ids: []
+        ids: [],
+        CategoryTreeList: []
       }
     },
     mounted() {
+      this.getSysCategoryTree()
     },
     methods: {
+      getSysCategoryTree() {
+        getAction(this.url.getSysCategoryTree, {}).then((res) => {
+          if (res.success) {
+            this.CategoryTreeList = res.result
+          } else {
+            this.CategoryTreeList = []
+          }
+        })
+      },
       edit(data) {
         this.visible = true
+        this.getSysCategoryTree()
         this.$nextTick(() => {
           this.ids = data || []
           this.formInline = {}
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 1ee80f7d8..6143350a9 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -145,7 +145,8 @@
                  @click="deleteLib(record)">
                 {{ $t('deleteLib') }}
               </a>
-                 <a @click="addProcess(record)">发起</a>
+<!--               <a class="text-operation" @click="resultReportedClick(record)">{{$t('resultReported')}}</a>-->
+              <a @click="addProcess(record)">发起</a>
         </span>
         <span slot="titleName" slot-scope="text,record" :title="text">
                   {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }}
@@ -260,6 +261,7 @@
         </span>
       </a-table>
     </a-modal>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
   </a-card>
 </template>
 
@@ -267,6 +269,7 @@
   import ImportFile from '@/components/ImportFile/index'
   import listAddModel from './listAddModel'
   import listEditModel from './listEditModel'
+  import uploadFile from '@/components/uploadFile/file'
   import batSetting from './batSetting'
   import transferList from './transferList'
   import fixedPlate from './fixedPlateForm'
@@ -283,6 +286,7 @@
       listAddModel,
       listEditModel,
       batSetting,
+      uploadFile,
       transferList,
       globalAdvancedQuery,
       fixedPlate
@@ -492,7 +496,7 @@
             title: this.$t('operation'),
             align: 'center',
             fixed: 'right',
-            width: 140,
+            width: 210,
             scopedSlots: { customRender: 'operation' }
           }
         ],
@@ -819,6 +823,7 @@
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
+
       initiateTaskConfirmationClick(name) {
         this.timeName = name
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
@@ -846,6 +851,7 @@
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
+
       handleOk() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
@@ -891,6 +897,7 @@
           }
         })
       },
+
       startProcess(value) {
         let query = {
           type: 1,
@@ -905,6 +912,7 @@
           }
         })
       },
+
       completeTask(value, taskId) {
         let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
         value.handlingTime = handlingTime
@@ -926,6 +934,7 @@
           }
         })
       },
+
       getRowKeys(value, callBack) {
         let isTrue = true
         for (let i = 0; i < this.dataSource.length; i++) {
@@ -957,6 +966,7 @@
           callBack()
         }
       },
+
       updateStatusBatch(num, selectedRowKeys) {
         let _this = this
         let query = {
@@ -978,6 +988,7 @@
           }
         })
       },
+
       submitClick(num) {
         let _this = this
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
@@ -994,13 +1005,16 @@
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
+
       handleCancel() {
         this.formInline = {}
         this.visible = false
       },
+
       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') : ''
       },
+
       pdfPreview(fileQuery) {
         let fileName = fileQuery.fileName
         let index1 = fileName.lastIndexOf('.')
@@ -1018,6 +1032,7 @@
           downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
         }
       },
+
       pdfPreviewClick(name, id) {
         let fileName = name
         let index1 = fileName.lastIndexOf('.')
@@ -1035,9 +1050,11 @@
           downloadFile('/sys/common/downLoadFile', name, { id: id })
         }
       },
+
       download(item) {
         downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id })
       },
+
       clickButtonToUpload(item) {
         this.loading = true
         this.visibleFile = true
@@ -1058,6 +1075,7 @@
           }
         })
       },
+
       bringInRelevantPersonnelClick() {
         let _this = this
         this.$confirm({
@@ -1074,14 +1092,16 @@
           }
         })
       },
+
       addProcess(val) {
         let num = 2
         // for (let i = 0; i < 3; i++) {
         //   setTimeout(() => {
-            this.startProcessDesign(val)
+        this.startProcessDesign(val)
         //   }, 500)
         // }
       },
+
       startProcessDesign(value, num) {
         let query = {
           type: 2,
@@ -1093,6 +1113,7 @@
           }
         })
       },
+
       completeTaskDesign(value, taskId) {
         let query = {
           userid: this.userInfo().id,
@@ -1110,6 +1131,34 @@
             this.$message.warning(this.$t('operationFailed'))
           }
         })
+      },
+
+      resultReportedClick(val) {
+        this.clickButtonToUploadFile()
+      },
+      clickButtonToUploadFile(item) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.formInline[this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
       }
     }
   }