From 676a26ba31b5ebcc3f3c2a700429960027b121d8 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 20 May 2022 18:07:26 +0800
Subject: [PATCH] =?UTF-8?q?der=E6=8F=90=E4=BA=A4=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  2 +
 jero-web/src/common/lang/zh-cn.js             |  2 +
 .../components/taskCirculationHistory.vue     | 15 ++-
 .../projectManagement/components/TaskList.vue |  6 +-
 .../components/TaskListModel.vue              | 78 ++++++++++++++-
 .../projectManagement/components/addModel.vue | 96 ++++++++++++++-----
 6 files changed, 160 insertions(+), 39 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 89ee54133..727b31efc 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -866,4 +866,6 @@ module.exports = {
   pleaseReviewTask:'Please add the engineering confirmation information for this review task',
   pleaseWillBeReturned:'Please reconfirm the project confirmation results and the review results of the responsible person. If they meet the requirements, they will be submitted, otherwise they will be returned',
   pleaseSubmitStatus:'Please submit the data confirmed by the project in the confirmation status',
+  modelName:'Model Name',
+  modelYear:'Model year',
 }
\ 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 42e45223d..d90e9d8f9 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -871,4 +871,6 @@ module.exports = {
   pleaseReviewTask:'请您添加对该条审查任务的工程确认信息',
   pleaseWillBeReturned:'请对工程确认结果和责任人审查结果进行再次确认，若符合要求则进行提交，否则进行退回',
   pleaseSubmitStatus:'请把工程确认的数据都点为确认状态进行提交',
+  modelName:'车型名称',
+  modelYear:'年款',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
index 853cd401e..bc076dc53 100644
--- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
@@ -45,12 +45,12 @@
           {
             title: this.$t('operationNode'),
             dataIndex: 'name',
-            align: 'left',
+            align: 'left'
           },
           {
             title: this.$t('Operator'),
             dataIndex: 'assignee',
-            align: 'left',
+            align: 'left'
           },
           {
             title: this.$t('result'),
@@ -61,17 +61,14 @@
           {
             title: this.$t('opinion'),
             dataIndex: 'approvalOpinion',
-            align: 'left',
+            align: 'left'
           },
           {
             title: this.$t('operationTime'),
-            dataIndex: 'operatorTime',
+            dataIndex: 'createTime',
             align: 'left',
-            width:200,
-            fixed: 'right',
-            customRender: function(t, r, index) {
-              return moment(t).format('YYYY-MM-DD HH:mm:ss')
-            }
+            width: 200,
+            fixed: 'right'
           }
         ],
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download'
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index d7a46d05a..2abd5697d 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -211,14 +211,16 @@
           'Non-Compliance': 'nonConformityColor',
           'To be tracked': 'TrackedColor',
           'NA': 'notInvolvedColor',
-          'No rating': 'submittedColor'
+          'No rating': 'submittedColor',
+          'Termination of task': 'nonConformityColor',
         },
         statusText: {
           'Compliance': this.$t('accord'),
           'Non-Compliance': this.$t('nonConformity'),
           'To be tracked': this.$t('Tracked'),
           'NA': this.$t('notInvolved'),
-          'No rating': this.$t('toBeConfirmed')
+          'No rating': this.$t('toBeConfirmed'),
+          'Termination of task': this.$t('taskTermination'),
         },
         CertificationColor: {
           'Test passed': 'accordColor',
diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue
index 80e5e71e0..c8a11adfd 100644
--- a/jero-web/src/views/projectManagement/components/TaskListModel.vue
+++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue
@@ -47,7 +47,7 @@
           </div>
         </a-col>
 
-        <a-col :span="24" v-if="title == $t('CurrentProjectStatusEvaluation')">
+        <a-col :span="24" v-if="title == $t('CurrentProjectStatusEvaluation') && this.formInline.roleCode != '0'">
           <div class="box-title-text">
             <div class="title-text">
               <span class="title-text-text"
@@ -84,7 +84,7 @@
           </div>
         </a-col>
 
-        <a-col :span="24" v-if="title == $t('CurrentProjectStatusEvaluation')">
+        <a-col :span="24" v-if="title == $t('CurrentProjectStatusEvaluation') && this.formInline.roleCode != '0'">
           <div class="box-title-text">
             <div class="title-text">
               <span class="title-text-text"
@@ -98,13 +98,68 @@
             </a-form-model-item>
           </div>
         </a-col>
+
+        <div v-for="item in studioList" v-if="title == $t('CurrentProjectStatusEvaluation') && formInline.roleCode == '0'">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+              <span class="title-text-text"
+                    :title="$t('CurrentProjectStatusEvaluation')">{{$t('CurrentProjectStatusEvaluation')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="conditionAssessment">
+                <a-select
+                  :disabled="disabled"
+                  v-model="item.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'">
+                       <span style="display: inline-block;width: 100%">
+                             {{ $t('blue') }}
+                        </span>
+                  </a-select-option>
+                </a-select>
+              </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('remarks')">{{$t('remarks')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="remark">
+                <a-textarea
+                  :placeholder="$t('remarks')"
+                  :disabled="disabled"
+                  v-model="item.remark" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </div>
+
       </a-row>
     </a-form-model>
   </a-modal>
 </template>
 
 <script>
-  import { postAction, putAction } from '@/api/manage'
+  import { postAction, putAction, getAction } from '@/api/manage'
 
   export default {
     name: 'TaskListModel',
@@ -115,10 +170,12 @@
         title: this.$t('CertificationProgress'),
         visible: false,
         confirmLoading: false,
+        studioList: [],
         disabled: false,
         url: {
           edit: '/project/projectTaskInventoryEO/edit',
-          addOrUpdate: '/project/projectTaskInventoryConditionAssessmentEO/addOrUpdate'
+          addOrUpdate: '/project/projectTaskInventoryConditionAssessmentEO/addOrUpdate',
+          list: '/project/projectTaskInventoryConditionAssessmentEO/list'
         }
       }
     },
@@ -135,6 +192,9 @@
           if (val.roleCode == '2' || val.roleCode == '4' || val.roleCode == '1') {
             this.disabled = false
           } else {
+            if (val.roleCode == '0') {
+              this.getList(val)
+            }
             this.disabled = true
           }
         } else {
@@ -144,12 +204,20 @@
             this.disabled = true
           }
         }
-        console.log(val.conditionAssessment)
         this.formInline = val
         this.$nextTick(() => {
           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 }
diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue
index edeb32d39..639382049 100644
--- a/jero-web/src/views/projectManagement/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/addModel.vue
@@ -15,10 +15,10 @@
             <div class="box-title-text">
               <div class="title-text">
                 <span class="Required">*</span>
-                <span class="title-text-text" :title="$t('entryName')">{{$t('entryName')}}</span>
+                <span class="title-text-text" :title="$t('modelName')">{{$t('modelName')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="projectNameId">
-                <a-select :placeholder="$t('PleaseSelect')+$t('entryName')"
+                <a-select :placeholder="$t('PleaseSelect')+$t('modelName')"
                           @change="projectNameChange"
                           v-model="formInline.projectNameId">
                   <a-select-option v-for="(item, key) in projectNameList"
@@ -32,6 +32,28 @@
               </a-form-model-item>
             </div>
           </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('modelYear')">{{$t('modelYear')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="yearName">
+                <a-select :placeholder="$t('PleaseSelect')+$t('modelYear')"
+                          v-model="formInline.yearName">
+                  <a-select-option v-for="(item, key) in projectNameList"
+                                   :key="key"
+                                   :value="item.id">
+                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
+                           {{ item.projectName}}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -47,8 +69,6 @@
               </a-form-model-item>
             </div>
           </a-col>
-        </a-row>
-        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -65,6 +85,8 @@
               </a-form-model-item>
             </div>
           </a-col>
+        </a-row>
+        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -81,8 +103,6 @@
               </a-form-model-item>
             </div>
           </a-col>
-        </a-row>
-        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -98,38 +118,36 @@
               </a-form-model-item>
             </div>
           </a-col>
+        </a-row>
+        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="title-text-text" :title="$t('ModelPlatform')">{{$t('ModelPlatform')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="vehiclePlatform">
-                <j-dict-select-tag class="box-input" v-model="formInline.vehiclePlatform"
-                                   :disabled="disabled"
-                                   @input="handleInput('vehiclePlatform')"
-                                   :placeholder="$t('PleaseSelect')+$t('ModelPlatform')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'vehicle_platform'"/>
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         v-model="formInline.vehiclePlatform"
+                         :placeholder="$t('PleaseEnter')+$t('ModelPlatform')"/>
               </a-form-model-item>
             </div>
           </a-col>
-        </a-row>
-        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="title-text-text" :title="$t('DigitalPlatform')">{{$t('DigitalPlatform')}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="'digitalPlatform'">
-                <j-dict-select-tag class="box-input" v-model="formInline.digitalPlatform"
-                                   :disabled="disabled"
-                                   @input="handleInput('digitalPlatform')"
-                                   :placeholder="$t('PleaseSelect')+$t('DigitalPlatform')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'digital_platform'"/>
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         v-model="formInline.digitalPlatform"
+                         :placeholder="$t('PleaseEnter')+$t('DigitalPlatform')"/>
               </a-form-model-item>
             </div>
           </a-col>
+        </a-row>
+        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -145,8 +163,6 @@
             <!--            ^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%\$#_]*)?$
             -->
           </a-col>
-        </a-row>
-        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -161,6 +177,8 @@
               </a-form-model-item>
             </div>
           </a-col>
+        </a-row>
+        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -234,6 +252,20 @@
               trigger: 'blur'
             }
           ],
+          vehiclePlatform:[
+            {
+              max: 100,
+              message: this.$t('ModelPlatform') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          digitalPlatform:[
+            {
+              max: 100,
+              message: this.$t('DigitalPlatform') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
           projectNameId: [
             {
               required: true,
@@ -241,6 +273,13 @@
               trigger: 'change'
             }
           ],
+          yearName: [
+            {
+              required: true,
+              message: this.$t('modelYear') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
           targetMarket: [
             {
               required: true,
@@ -270,6 +309,7 @@
     },
     mounted() {
       this.getNameList()
+      this.getSpaceInfo()
     },
     methods: {
       ...mapGetters(['userInfo']),
@@ -282,11 +322,21 @@
           }
         })
       },
+      getSpaceInfo() {
+        postAction('/project/projectNameInfoEO/getSpaceInfo', {}).then((res) => {
+          if (res.success) {
+            // this.projectNameList = res.result || []
+          } else {
+            this.projectNameList = []
+          }
+        })
+      },
       addModel() {
         this.visible = true
         this.title = this.$t('add')
         this.formInline = {}
         this.getNameList()
+        this.getSpaceInfo()
         this.formInline.studioEngineerName = this.userInfo().username
         this.formInline.studioEngineer = this.userInfo().id
         this.$nextTick(() => {
@@ -459,7 +509,7 @@
     padding: 10px 16px;
     text-align: right;
     left: 0;
-    z-index:100;
+    z-index: 100;
     background: #fff;
     border-radius: 0 0 2px 2px;
   }