修改任务清单的编辑

jero-web/src/common/lang/en-us.js

@@ -773,4 +773,12 @@ module.exports = {
   adopt:'adopt',
   reviewedByThePersonInCharge:'Reviewed by the person in charge',
   onlyDeleted:'Only data whose list confirmation status is not initiated or rejected can be deleted',
+  experimentPassed:'Experiment passed',
+  experimentFailed:'Experiment failed',
+  toBeStarted:'To be started',
+  inProgress:'In Progress',
+  green:'green',
+  red:'red',
+  blue:'blue',
+  yellow:'yellow',
 }

jero-web/src/common/lang/zh-cn.js

@@ -778,4 +778,12 @@ module.exports = {
   adopt:'通过',
   reviewedByThePersonInCharge:'负责人审核',
   onlyDeleted:'只能删除清单确认状态为未发起或拒绝的数据',
+  experimentPassed:'实验通过',
+  experimentFailed:'实验失败',
+  toBeStarted:'待开始',
+  inProgress:'进行中',
+  green:'绿',
+  red:'红',
+  blue:'蓝',
+  yellow:'黄',
 }

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -431,12 +431,13 @@
         this.bussLogList()
       },
       DocumentSplitting() {
-        this.$router.push({
+        let newUrl = this.$router.resolve({
           path: '/docManage/splite',
           query: {
             serial_number: this.$route.query.serial_number
           }
         })
+        window.open(newUrl.href, '_blank')
       },
       detailClick(val) {
         let newUrl = this.$router.resolve({

jero-web/src/views/projectManagement/components/TaskList.vue

@@ -39,10 +39,6 @@
         <a-icon type="export" :rotate="-90"/>
         {{$t('export')}}
       </div>
-      <div @click="addProcess" class="operator-text">
-        <a-icon type="export" :rotate="-90"/>
-        发起1
-      </div>
     </div>
     <div style="width: 100%">
       <a-table
@@ -91,29 +87,32 @@
           </div>
         </div>
         <div slot="CertificationProgress" slot-scope="text,result">
-             <span class="box-content-color">
+             <span class="box-content-color box-content-cou" @click="CertificationProgressClick(result)">
                   实验通过
              </span>
         </div>
         <div slot="CurrentProjectStatusEvaluation" slot-scope="text,result">
-          <div class="Current-color">
+          <div class="Current-color box-content-cou" @click="CurrentProjectClick(result)">
             <div class="Current-color-box"></div>
           </div>
         </div>
       </a-table>
     </div>
     <certificationDirectory :url="url" ref="certificationDirectoryRef"/>
+    <TaskListModel ref="TaskListModelRef"/>
   </a-card>
 </template>
 
 <script>
   import certificationDirectory from './certificationDirectory'
+  import TaskListModel from './TaskListModel'
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
 
   export default {
     name: 'TaskList',
     components: {
-      certificationDirectory
+      certificationDirectory,
+      TaskListModel
     },
     data() {
       return {
@@ -207,11 +206,20 @@
         }
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
-            this.dataSource = res.result
+            // this.dataSource = res.result
+            this.dataSource = [{}]
           } else {
             this.dataSource = []
           }
         })
+      },
+      CertificationProgressClick(val) {
+        let item = JSON.parse(JSON.stringify(val))
+        this.$refs.TaskListModelRef.getData(item, this.$t('CertificationProgress'))
+      },
+      CurrentProjectClick(val) {
+        let item = JSON.parse(JSON.stringify(val))
+        this.$refs.TaskListModelRef.getData(item, this.$t('CurrentProjectStatusEvaluation'))
       }
     }
   }
@@ -332,6 +340,10 @@
     background: red;
     border-radius: 50%;
   }
+
+  .box-content-cou {
+    cursor: pointer;
+  }
 </style>
 <style>
   .box-input .ant-select-selection {

jero-web/src/views/projectManagement/components/TaskListModel.vue

@@ -0,0 +1,189 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="600"
+    :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" v-if="title == $t('CertificationProgress')">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="Required">*</span>
+              <span class="title-text-text"
+                    :title="$t('CertificationProgress')">{{$t('CertificationProgress')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="remarks">
+              <a-select :placeholder="$t('PleaseSelect')+$t('CertificationProgress')">
+                <a-select-option :key="1" :value="1">
+                     <span style="display: inline-block;width: 100%">
+                            {{ $t('experimentPassed') }}
+                     </span>
+                </a-select-option>
+                <a-select-option :key="2" :value="2">
+                     <span style="display: inline-block;width: 100%">
+                            {{ $t('experimentFailed') }}
+                     </span>
+                </a-select-option>
+                <a-select-option :key="3" :value="3">
+                     <span style="display: inline-block;width: 100%">
+                            {{ $t('toBeStarted') }}
+                     </span>
+                </a-select-option>
+                <a-select-option :key="4" :value="4">
+                     <span style="display: inline-block;width: 100%">
+                            {{ $t('inProgress') }}
+                     </span>
+                </a-select-option>
+                <a-select-option :key="5" :value="5">
+                     <span style="display: inline-block;width: 100%">
+                            {{ $t('notInvolved') }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+        <a-col :span="24" v-if="title == $t('CertificationProgress')">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="Required">*</span>
+              <span class="title-text-text"
+                    :title="$t('remarks')">{{$t('remarks')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="remarks">
+              <a-textarea
+                :placeholder="$t('PleaseEnter')+$t('remarks')"
+                :disabled="false"
+                v-model="formInline.remark" :rows="4"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+        <a-col :span="24" v-if="title == $t('CurrentProjectStatusEvaluation')">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="Required">*</span>
+              <span class="title-text-text"
+                    :title="$t('CurrentProjectStatusEvaluation')">{{$t('CurrentProjectStatusEvaluation')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="remarks">
+              <a-select :placeholder="$t('PleaseSelect')+$t('CurrentProjectStatusEvaluation')">
+                <a-select-option :key="1" :value="1">
+                     <span style="display: inline-block;width: 100%">
+                            {{ $t('green') }}
+                     </span>
+                </a-select-option>
+                <a-select-option :key="2" :value="2">
+                     <span style="display: inline-block;width: 100%">
+                            {{ $t('red') }}
+                     </span>
+                </a-select-option>
+                <a-select-option :key="3" :value="3">
+                     <span style="display: inline-block;width: 100%">
+                            {{ $t('blue') }}
+                     </span>
+                </a-select-option>
+                <a-select-option :key="4" :value="4">
+                     <span style="display: inline-block;width: 100%">
+                            {{ $t('yellow') }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+        <a-col :span="24" v-if="title == $t('CurrentProjectStatusEvaluation')">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="Required">*</span>
+              <span class="title-text-text"
+                    :title="$t('remarks')">{{$t('remarks')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="remarks">
+              <a-textarea
+                :placeholder="$t('remarks')"
+                :disabled="false"
+                v-model="formInline.remark" :rows="4"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+  export default {
+    name: 'TaskListModel',
+    data() {
+      return {
+        formInline: {},
+        rules: {},
+        title: this.$t('CertificationProgress'),
+        visible: false,
+        confirmLoading: false
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      getData(val, title) {
+        this.visible = true
+        this.title = title
+      },
+      handleOk() {
+
+      }
+    }
+  }
+</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;
+  }
+</style>

jero-web/src/views/projectManagement/components/certificationDirectory.vue

@@ -46,7 +46,6 @@
         <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
       </div>
     </a-drawer>
-
   </div>
 
 </template>

jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue

@@ -321,7 +321,10 @@ export default {
     color: red;
   }
 }
-
+.drawer-bootom-button{
+  display: flex;
+  justify-content: center;
+}
 </style>
 <style lang='less'>
 .area-module {
@@ -335,8 +338,4 @@ export default {
     }
   }
 }
-.drawer-bootom-button{
-  display: flex;
-  justify-content: center;
-}
 </style>