diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue
index 953e9aaa2..69b6313b3 100644
--- a/jero-web/src/components/TaskCutOffTime/index.vue
+++ b/jero-web/src/components/TaskCutOffTime/index.vue
@@ -286,6 +286,9 @@ export default {
 }
 </style>
 <style scoped>
+/deep/.ant-modal-body{
+  height: 100% !important;
+}
 .box-title-text {
   line-height: 1.4;
   display: flex;
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 3ab81739e..027c52073 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -635,6 +635,7 @@
                   dataIndex: res.db_field_name,
                   align: 'center',
                   // ellipsis: true,
+                  fixed: res.click3?'left':'',
                   sorter: res.sort,
                   width: 160
                 })
diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index b64ae61a5..4635092ce 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -644,12 +644,12 @@ export default {
       // } else {
       //   value.technologyTerritory = value.technologyTerritory.split(',')
       // }
+      this.formInline = value
       if(this.formInline.controlType == 11){
         this.required = false
       }else{
         this.required = true
       }
-      this.formInline = value
       this.title = this.$t('edit')
       this.flag = 0
       //  获取认证类别
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 6b10ef02e..6c6f978eb 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -106,6 +106,8 @@
         :pagination="false"
         :scroll="{x: true}"
         :data-source="dataSource"
+        rowKey="id"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
         <div slot="standardInformation" slot-scope="text,result" class="box-left">
@@ -184,11 +186,37 @@
     <certificationDirectory :isDisplayNum="isDisplayNum" :url="url" ref="certificationDirectoryRef"/>
     <TaskListModel @TaskListModelList="TaskListModelList" ref="TaskListModelRef"/>
     <taskBatSetting @taskBatSettingForm="taskBatSettingForm" ref="taskBatSettingRef"></taskBatSetting>
+    <batchChangeModel ref="batchChangeModelRef"/>
+    <batchModel ref="batchModelRef"/>
+    <!--    错误数据提示-->
+    <a-modal
+      :title="$t('operationFailed')"
+      :width="860"
+      v-model="visibleoperationFailed"
+      :maskClosable="false"
+      @cancel='cancleoperationFailed'
+      :footer="null"
+    >
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <span style='font-size: 16px;margin-bottom: 20px;' v-for='(item,key) in NotSelectedNoEngineerValue'>
+            <span>{{ item.nioNumber }}</span>
+          </span>
+        </a-col>
+      </a-row>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap">
+          <a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
   </a-card>
 </template>
 
 <script>
   import certificationDirectory from './certificationDirectory'
+  import batchChangeModel from './batchChangeModel'
+  import batchModel from './batchModel'
   import TaskListModel from './TaskListModel'
   import taskBatSetting from './taskBatSetting'
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
@@ -200,6 +228,8 @@
     components: {
       certificationDirectory,
       TaskListModel,
+      batchChangeModel,
+      batchModel,
       taskBatSetting
     },
     props: ['isDisplayNum', 'areaOfResponsibility'],
@@ -265,6 +295,7 @@
           }
         ],
         selectedRowKeys: [],
+
         status: {
           'NotDone': '待办',
           'haveDone': '已办',
@@ -311,7 +342,11 @@
           exportXls: '/project/projectTaskInventoryEO/exportXls'
         },
         loading: false,
+        visibleoperationFailed:false,
+        NotSelectedNoEngineerValue:[],
         dataSource: [],
+        selectionRowsArray:[],
+        roleCodes:[],
         long: ''
       }
     },
@@ -358,8 +393,9 @@
       taskBatSettingForm() {
         this.getList()
       },
-      onSelectChange(value) {
+      onSelectChange(value, selectionRows) {
         this.selectedRowKeys = value
+        this.selectionRowsArray = selectionRows
       },
       handleExport() {
         let query = {
@@ -456,6 +492,7 @@
       CertificationDirectory() {
         this.$refs.certificationDirectoryRef.addModel()
       },
+
       getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
         Object.keys(queryParam).forEach(val => {
@@ -490,6 +527,68 @@
         let item = JSON.parse(JSON.stringify(val))
         this.$refs.TaskListModelRef.getData(item, this.$t('CurrentStatus'))
       },
+      //批量维护进度
+
+      BatchMaintenanceProgress() {
+        if(this.selectionRowsArray.length <1){
+          this.$message.warning(this.$t('selectLeastOne'))
+        }else{
+          let query = {}
+          let projectLawsInventoryIds = []
+          let roleCodes = []
+          this.selectionRowsArray.forEach((item,index) => {
+            projectLawsInventoryIds.push(item.projectLawsInventoryId)
+            roleCodes.push(item.roleCode)
+          })
+          query = {
+            roleCodes: roleCodes.join(','),
+            projectLawsInventoryIds: projectLawsInventoryIds.join(',')
+          }
+          getAction(this.url.list, query).then((res) => {
+            if (res.success) {
+              this.$refs.batchModelRef.getData(this.selectedRowKeys)
+            } else {
+              this.NotSelectedNoEngineerValue = res.result
+              this.visibleoperationFailed = true
+            }
+          })
+
+
+        }
+
+
+      },
+      //批量修改状态
+      BatchChangeStatus() {
+        if(this.selectionRowsArray.length <1){
+          this.$message.warning(this.$t('selectLeastOne'))
+        }else{
+          let query = {}
+          let projectLawsInventoryIds = []
+          let roleCodes = []
+          this.selectionRowsArray.forEach((item,index) => {
+            projectLawsInventoryIds.push(item.projectLawsInventoryId)
+            roleCodes.push(item.roleCode)
+          })
+          query = {
+            roleCodes: roleCodes.join(','),
+            projectLawsInventoryIds: projectLawsInventoryIds.join(',')
+          }
+          getAction(this.url.list, query).then((res) => {
+            if (res.success) {
+              this.$refs.batchChangeModelRef.getData(this.selectionRowsArray)
+            } else {
+              this.NotSelectedNoEngineerValue = res.result
+              this.visibleoperationFailed = true
+            }
+          })
+
+        }
+
+      },
+      cancleoperationFailed(){
+        this.visibleoperationFailed = false
+      },
       TaskListModelList() {
         this.getList()
       },
diff --git a/jero-web/src/views/projectManagement/components/batchChangeModel.vue b/jero-web/src/views/projectManagement/components/batchChangeModel.vue
index 6b10ef02e..31de148ef 100644
--- a/jero-web/src/views/projectManagement/components/batchChangeModel.vue
+++ b/jero-web/src/views/projectManagement/components/batchChangeModel.vue
@@ -1,48 +1,33 @@
+<!--批量当前状态-->
 <template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('standard')">
-                <span>{{$t('standard')}}</span>
-              </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                       v-model="queryParam.serialNumber"></j-input>
+  <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">
+        <div class="headerText">
+          {{this.$t('redSchedule')}}<br/>
+          {{this.$t('yellowSchedule')}}<br/>
+          {{this.$t('greenRequirements')}}<br/>
+          {{this.$t('blueUndeterminedState')}}
+        </div>
+        <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-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('areaOfResponsibility')">
-                <span>{{$t('areaOfResponsibility')}}</span>
-              </div>
-              <j-multi-select-tag class="box-input" v-model="queryParam.dutyTerritory"
-                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                  :type="'select'"
-                                  :triggerChange="false" :dictCode="'duty_territory'"/>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('CertificationProgress')">
-                <span>{{$t('CertificationProgress')}}</span>
-              </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.certificationProgress"
-                                 :placeholder="$t('PleaseSelect')+$t('CertificationProgress')"
-                                 :type="'select'"
-                                 :triggerChange="false" :dictCode="'certification_progress'"/>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('CurrentStatus')">
-                <span>{{$t('CurrentStatus')}}</span>
-              </div>
+            <a-form-model-item class="itemModel" prop="conditionAssessment">
               <a-select
-                class="box-input"
-                v-model="queryParam.projectStatusAssess"
-                :placeholder="$t('PleaseSelect')+$t('CurrentStatus')">
+                :disabled="disabled"
+                v-model="formInline.conditionAssessment"
+                :placeholder="$t('PleaseSelect')+$t('CurrentProjectStatusEvaluation')">
                 <a-select-option :value="'1'">
                              <span style="display: inline-block;width: 100%">
                                     {{ $t('red') }}
@@ -58,667 +43,174 @@
                                     {{ $t('green') }}
                              </span>
                 </a-select-option>
-                <a-select-option :value="'4'">
+
+                <a-select-option :value="'4'" disabled>
                                <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-col>
-          <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
-               <a-col :md="6" :sm="24">
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
-               </a-col>
-            </span>
-        </a-row>
-      </a-form>
-    </div>
-    <div class="table-operator">
-<!--      <div class="operator-text" @click="batSettingClick">-->
-<!--        <a-icon type="setting"/>-->
-<!--        {{ $t('batSetting') }}-->
-<!--      </div>-->
-      <div @click="BatchMaintenanceProgress" class="operator-text">
-        {{$t('BatchMaintenanceProgress')}}
-      </div>
-      <div @click="BatchChangeStatus" class="operator-text">
-        {{$t('BatchChangeStatus')}}
-      </div>
-      <div @click="CertificationDirectory" class="operator-text">
-        <a-icon type="bulb"/>
-        {{$t('CertificationDirectory')}}
-      </div>
-      <div @click="handleExport" class="operator-text">
-        <a-icon type="export" :rotate="-90"/>
-        {{$t('export')}}
-      </div>
-    </div>
-    <div style="width: 100%">
-      <!--        rowKey="id"
-      :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"-->
-      <a-table
-        ref="table"
-        bordered
-        class="taskTable"
-        :loading="loading"
-        :pagination="false"
-        :scroll="{x: true}"
-        :data-source="dataSource"
-        :columns="columns"
-      >
-        <div slot="standardInformation" slot-scope="text,result" class="box-left">
-          <div class="content">
-            <a class="box-content-a" @click="standardClick(result)"
-               :title="result.serialNumber">{{result.serialNumber}}</a>
-            <a class="box-content-buttom" :title="result.title">{{result.title}}</a>
+            <a-form-model-item class="itemModel" prop="remark">
+              <a-textarea
+                :placeholder="$t('remarks')"
+                :disabled="disabled"
+                v-model="formInline.remark" :rows="4"/>
+            </a-form-model-item>
           </div>
-        </div>
-        <div slot="areaOfResponsibility" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.dutyTerritory_dictText">
-            <span v-for="(item,index) in result.dutyTerritory_dictText.split(',')">
-            <span class="box-content-index">{{item}}</span><br/>
-            </span>
-          </div>
-        </div>
-        <div slot="confirmationOfDesignConformity" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.designTaskStatus" @click="verifyTaskClick(result,1,false)">
-            <span class="box-content">{{$t('Deadline')}}: {{result.designDueDate}}</span><br/>
-            <span class="box-content">{{$t('ProcessStatus')}}: {{result.designStatus}}</span><br/>
-            <span class="box-content-color"
-                  :style="{'width':long=='zh-cn'?'78px' : '138px'}"
-                  :class="color[result.designFlowTaskStatus]">
-               {{statusText[result.designFlowTaskStatus]}}
-            </span>
-          </div>
-          <div class="content-box" v-if="result.designTaskStatus == 'NotDone'" @click="verifyTaskClick(result,1,true)">
-            <div class="content-box-jiao"></div>
-          </div>
-        </div>
-        <div slot="PrehomoConfirmation" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.prehomoTaskStatus" @click="verifyTaskClick(result,2,false)">
-            <span class="box-content">{{$t('Deadline')}}: {{result.prehomoDueDate}}</span><br/>
-            <span class="box-content">{{$t('ProcessStatus')}}: {{result.prehomoStatus}}</span><br/>
-            <span class="box-content-color"
-                  :style="{'width':long=='zh-cn'?'78px' : '138px'}"
-                  :class="color[result.prehomoFlowTaskStatus]">
-              {{statusText[result.prehomoFlowTaskStatus]}}
-            </span>
-          </div>
-          <div class="content-box" v-if="result.prehomoTaskStatus == 'NotDone'" @click="verifyTaskClick(result,2,true)">
-            <div class="content-box-jiao"></div>
-          </div>
-        </div>
-        <div slot="verificationAndConformityconfirmation" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.verifyTaskStatus" @click="verifyTaskClick(result,3,false)">
-            <span class="box-content">{{$t('Deadline')}}: {{result.verifyDueDate}}</span><br/>
-            <span class="box-content">{{$t('ProcessStatus')}}: {{result.verifyStatus}}</span><br/>
-            <span class="box-content-color"
-                  :style="{'width':long=='zh-cn'?'78px' : '138px'}"
-                  :class="color[result.verifyFlowTaskStatus]">
-                {{statusText[result.verifyFlowTaskStatus]}}
-            </span>
-          </div>
-          <div class="content-box" v-if="result.verifyTaskStatus == 'NotDone'" @click="verifyTaskClick(result,3,true)">
-            <div class="content-box-jiao"></div>
-          </div>
-        </div>
-        <div slot="CertificationProgress" slot-scope="text,result">
-             <span class="box-content-Progress box-content-cou"
-                   :style="{'width':long=='zh-cn'?'88px' : '108px'}"
-                   :class="CertificationColor[result.certificationProgress]"
-                   @click="CertificationProgressClick(result)"
-             >
-              {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('maintainProgress')}}
-             </span>
-        </div>
-        <div slot="CurrentProjectStatusEvaluation" slot-scope="text,result">
-          <div class="Current-color box-content-cou" :style="{'background':CurrentColor[result.projectStatusAssess]}"
-               @click="CurrentProjectClick(result)">
-            <div class="Current-color-box" :style="{'background':CurrentColorBox[result.projectStatusAssess]}"></div>
-          </div>
-        </div>
-      </a-table>
-    </div>
-    <certificationDirectory :isDisplayNum="isDisplayNum" :url="url" ref="certificationDirectoryRef"/>
-    <TaskListModel @TaskListModelList="TaskListModelList" ref="TaskListModelRef"/>
-    <taskBatSetting @taskBatSettingForm="taskBatSettingForm" ref="taskBatSettingRef"></taskBatSetting>
-  </a-card>
+        </a-col>
+
+      </a-row>
+    </a-form-model>
+  </a-modal>
 </template>
 
 <script>
-  import certificationDirectory from './certificationDirectory'
-  import TaskListModel from './TaskListModel'
-  import taskBatSetting from './taskBatSetting'
-  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
-  import { mapGetters } from 'vuex'
-  import store from '@/store/'
+import { postAction, putAction, getAction } from '@/api/manage'
 
-  export default {
-    name: 'TaskList',
-    components: {
-      certificationDirectory,
-      TaskListModel,
-      taskBatSetting
-    },
-    props: ['isDisplayNum', 'areaOfResponsibility'],
-    data() {
-      return {
-        columns: [
-          {
-            title: this.$t('number'),
-            align: 'center',
-            width: 70,
-            customRender: function(t, r, index) {
-              return parseInt(index) + 1
-            }
-          },
-          {
-            title: this.$t('standardInformation'),
-            align: 'center',
-            dataIndex: 'standard',
-            width: 202,
-            scopedSlots: { customRender: 'standardInformation' }
-          },
-          {
-            title: this.$t('areaOfResponsibility'),
-            align: 'center',
-            width: 180,
-            dataIndex: 'areaOfResponsibility',
-            scopedSlots: { customRender: 'areaOfResponsibility' }
-          },
-          {
-            title: this.$t('confirmationOfDesignConformity'),
-            align: 'center',
-            width: 240,
-            dataIndex: 'confirmationOfDesignConformity',
-            scopedSlots: { customRender: 'confirmationOfDesignConformity' }
-          },
-          {
-            title: this.$t('PrehomoConfirmation'),
-            align: 'center',
-            width: 240,
-            dataIndex: 'PrehomoConfirmation',
-            scopedSlots: { customRender: 'PrehomoConfirmation' }
-          },
-          {
-            title: this.$t('verificationAndConformityconfirmation'),
-            align: 'center',
-            width: 240,
-            dataIndex: 'verificationAndConformityconfirmation',
-            scopedSlots: { customRender: 'verificationAndConformityconfirmation' }
-          },
-          {
-            title: this.$t('CertificationProgress'),
-            align: 'center',
-            width: 150,
-            dataIndex: 'CertificationProgress',
-            scopedSlots: { customRender: 'CertificationProgress' }
-          },
-          {
-            title: this.$t('CurrentStatus'),
-            align: 'center',
-            width: 150,
-            dataIndex: 'CurrentProjectStatusEvaluation',
-            scopedSlots: { customRender: 'CurrentProjectStatusEvaluation' }
-          }
-        ],
-        selectedRowKeys: [],
-        status: {
-          'NotDone': '待办',
-          'haveDone': '已办',
-          'showData': '展示数据'
-        },
-        color: {
-          'Compliance': 'accordColor',
-          'Non-Compliance': 'nonConformityColor',
-          'To be tracked': 'TrackedColor',
-          'NA': 'notInvolvedColor',
-          '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'),
-          'Termination of task': this.$t('taskTermination')
-        },
-        CertificationColor: {
-          'Test passed': 'accordColor',
-          'Test failed': 'nonConformityColor',
-          'In progress': 'TrackedColor',
-          'NA': 'notInvolvedColor',
-          'Not start': 'submittedColor'
-        },
-        queryParam: {},
-        CurrentColor: {
-          '1': '#f3dddd',
-          '2': '#f6ebdb',
-          '3': '#dbf6e2',
-          '4': '#ddf3f4'
-        },
-        CurrentColorBox: {
-          '1': '#E83030',
-          '2': '#FDA71C',
-          '3': '#26BD4B',
-          '4': '#00B3BE'
-        },
-        url: {
-          list: '/project/projectTaskInventoryEO/list',
-          exportXls: '/project/projectTaskInventoryEO/exportXls'
-        },
-        loading: false,
-        dataSource: [],
-        long: ''
-      }
-    },
-    watch: {
-      '$socketPublic.state.msg': {
-        //处理接收到的消息
-        handler: function(res) {
-          let that = this
-          let data = JSON.parse(res.data)
-          if (data.msgId) {
-            this.getList()
-          }
-        }
-      }
-    },
-    created() {
-      if (store.getters.userInfo) {
-        this.$socketPublic.dispatch('webSocketInit')//初始化ws
-      }
-    },
-    mounted() {
-      if (this.areaOfResponsibility.dutyTerritory) {
-        this.queryParam.dutyTerritory = this.areaOfResponsibility.dutyTerritory
-      }
-      this.getList()
-      this.long = localStorage.getItem('language') || 'zh-cn'
-    },
-    methods: {
-      ...mapGetters(['userInfo']),
-      searchQuery() {
-        this.getList()
-      },
-      searchReset() {
-        this.queryParam = {}
-        this.getList()
-      },
-      batSettingClick() {
-        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          this.$refs.taskBatSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
-        } else {
-          this.$message.warning(this.$t('selectLeastOne'))
-        }
-      },
-      taskBatSettingForm() {
-        this.getList()
-      },
-      onSelectChange(value) {
-        this.selectedRowKeys = value
-      },
-      handleExport() {
-        let query = {
-          ...this.queryParam,
-          projectLibraryId: this.$route.query.id
-        }
-        downloadFile(this.url.exportXls, this.$t('taskList') + '.xls', query, this.Deselect)
-      },
-      verifyTaskClick(val, num, isTrue) {
-        let query = {}
-        switch (num) {
-          case 1:
-            query = {
-              taskIds: val.designTaskId,
-              actiProcInstId: val.designPId,
-              projectTaskInventoryId: val.projectLawsInventoryId,
-              projectLibraryId: this.$route.query.id,
-              id: this.$route.query.id,
-              studioEngineer: this.$route.query.studioEngineer,
-              serialNumber: val.serialNumber,
-              TaskKey: val.designTaskDefinitionKey,
-              isDisplay: isTrue,
-              flowType: 2,
-              Sponsor: 'designInitiatorName',
-              personLiable: 'designDutyName',
-              typeOfDeliverables: 'designDeliverableTypeName',
-              deliverableTemplate: 'designDeliverableTemplate',
-              DueDate: 'designDueDate',
-              remarks: 'designRemark',
-              projectName: this.$route.query.projectName,
-              targetMarket: this.$route.query.targetMarket,
-              projectNameId: this.$route.query.projectNameId,
-              primaryKeyId: val.designTaskDetailId,
-              PersonChargeFeedback: val.designPersonChargeFeedback
-            }
-            break
-          case 2:
-            query = {
-              taskIds: val.prehomoTaskId,
-              actiProcInstId: val.prehomoPId,
-              projectTaskInventoryId: val.projectLawsInventoryId,
-              studioEngineer: this.$route.query.studioEngineer,
-              projectLibraryId: this.$route.query.id,
-              serialNumber: val.serialNumber,
-              TaskKey: val.prehomoTaskDefinitionKey,
-              flowType: 3,
-              isDisplay: isTrue,
-              id: this.$route.query.id,
-              Sponsor: 'prehomoInitiatorName',
-              personLiable: 'prehomoDutyName',
-              typeOfDeliverables: 'prehomoDeliverableTypeName',
-              deliverableTemplate: 'prehomoDeliverableTemplate',
-              DueDate: 'prehomoDueDate',
-              remarks: 'prehomoRemark',
-              projectName: this.$route.query.projectName,
-              targetMarket: this.$route.query.targetMarket,
-              projectNameId: this.$route.query.projectNameId,
-              primaryKeyId: val.prehomoTaskDetailId,
-              PersonChargeFeedback: val.prehomoPersonChargeFeedback
-            }
-            break
-          case 3:
-            query = {
-              taskIds: val.verifyTaskId,
-              actiProcInstId: val.verifyPId,
-              id: this.$route.query.id,
-              projectLibraryId: this.$route.query.id,
-              studioEngineer: this.$route.query.studioEngineer,
-              serialNumber: val.serialNumber,
-              projectTaskInventoryId: val.projectLawsInventoryId,
-              TaskKey: val.verifyTaskDefinitionKey,
-              flowType: 4,
-              isDisplay: isTrue,
-              Sponsor: 'verifyInitiatorName',
-              personLiable: 'verifyDutyName',
-              typeOfDeliverables: 'verifyDeliverableTypeName',
-              deliverableTemplate: 'verifyDeliverableTemplate',
-              DueDate: 'verifyDueDate',
-              remarks: 'verifyRemark',
-              projectName: this.$route.query.projectName,
-              targetMarket: this.$route.query.targetMarket,
-              projectNameId: this.$route.query.projectNameId,
-              primaryKeyId: val.verifyTaskDetailId,
-              PersonChargeFeedback: val.verifyPersonChargeFeedback
-            }
-            break
-        }
-        let newUrl = this.$router.resolve({
-          path: '/taskListProcess',
-          query: query
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      CertificationDirectory() {
-        this.$refs.certificationDirectoryRef.addModel()
-      },
-      getList() {
-        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
-        Object.keys(queryParam).forEach(val => {
-          if (queryParam[val] instanceof Array) {
-            queryParam[val] = queryParam[val].join(',')
-          }
-        })
-        if (queryParam.dutyTerritory) {
-          queryParam.dutyTerritory = '*' + queryParam.dutyTerritory + '*'
-        }
-        let query = {
-          projectLibraryId: this.$route.query.id,
-          ...queryParam
-        }
-        this.loading = true
-        getAction(this.url.list, query).then((res) => {
-          if (res.success) {
-            this.dataSource = res.result
-            this.loading = false
-            // this.dataSource = [{}]
-          } else {
-            this.dataSource = []
-            this.loading = false
-          }
-        })
-      },
-      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('CurrentStatus'))
-      },
-      TaskListModelList() {
-        this.getList()
-      },
-      standardClick(row) {
-        let newUrl = this.$router.resolve({
-          path: '/docManage/library/detail',
-          query: {
-            id: row.standId
-          }
-        })
-        window.open(newUrl.href, '_blank')
+export default {
+  name: 'TaskListModel',
+  data() {
+    return {
+      formInline: {},
+      rules: {},
+      selectionRowsArray:[],
+      projectLawsInventoryIds:[],
+      roleCodes:[],
+      visible: false,
+      confirmLoading: false,
+      studioList: [],
+      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('BatchChangeStatus')
+      this.selectionRowsArray = 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 }
+        this.$refs.ruleForm.validateField([value])
+      })
+    },
+    handleOk() {
+      if (this.disabled) {
+        this.visible = false
+        return
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          let query = {}
+          let projectLawsInventoryIds = []
+          let roleCodes = []
+          let url = ''
+          let Action
+          this.selectionRowsArray.forEach((item,index) => {
+            projectLawsInventoryIds.push(item.projectLawsInventoryId)
+            roleCodes.push(item.roleCode)
+          })
+            query = {
+              roleCodes: roleCodes.join(','),
+              remark: this.formInline.remark,
+              conditionAssessment: this.formInline.conditionAssessment,
+              projectLawsInventoryIds: projectLawsInventoryIds.join(',')
+            }
+            url = this.url.addOrUpdate
+            Action = postAction
+          this.confirmLoading = true
+          Action(url, query).then((res) => {
+            if (res.success) {
+              this.visible = false
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$emit('TaskListModelList')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
+        }
+      })
+    }
   }
+}
 </script>
 
-<style lang="less" scoped>
-  @import '~@assets/less/common.less';
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+}
 
-  .box-title-text {
-    line-height: 1.4;
-    display: flex;
-    align-items: center;
-    margin-bottom: 10px;
-  }
+.Required {
+  color: red;
+  margin-right: 4px;
+}
 
-  .title-text {
-    width: 64px;
-    color: #000F16;
-    display: inline-block;
-    font-weight: 500;
-    font-size: 14px;
-    margin-right: 16px;
-    margin-top: 3px;
-    text-align: right;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
+.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;
-    width: calc(100% - 64px);
-    height: 38px;
-    margin-top: 2px;
-  }
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
 
-  .box-button {
-    height: 38px;
-  }
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
 
-  .text-operation {
-    margin-right: 8px;
-  }
+.title-text-text {
+  margin-top: 9px;
+}
 
-  .page {
-    text-align: right;
-    margin-top: 20px;
-  }
-
-  .operator-text-left {
-    font-size: 14px;
-    margin-right: 20px;
-    background: #eff1f3;
-    padding: 8px 8px;
-    cursor: pointer;
-    border-radius: 4px;
-  }
-
-  .box-left {
-    position: relative;
-    display: block;
-    height: 100%;
-    text-align: left;
-  }
-
-  .content {
-    text-align: left;
-    margin: 0 auto;
-    display: inline-block;
-  }
-
-  .content-box {
-    position: absolute;
-    width: calc(100% + 32px);
-    height: calc(100% + 32px);
-    top: -16px;
-    left: -16px;
-    border: 1px #00B3BE solid;
-  }
-
-  .content-box-jiao {
-    position: absolute;
-    right: 0;
-    width: 0;
-    height: 0;
-    border-right: 14px solid #00B3BE;
-    border-bottom: 14px solid transparent
-  }
-
-  .box-content {
-    margin-bottom: 8px;
-    display: inline-block;
-    text-align: left;
-    font-weight: 400;
-    color: #040B29;
-  }
-
-  .box-content-a {
-    display: inline-block;
-    text-align: left;
-    margin-bottom: 8px;
-    font-weight: 400;
-    display: -webkit-box;
-    width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    /*! autoprefixer: off */
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 1;
-    /*! autoprefixer: on;*/
-    text-justify: inter-ideograph;
-    word-break: break-all
-  }
-
-  .box-content-index {
-    margin-bottom: 8px;
-    display: inline-block;
-    text-align: left;
-    font-weight: 400;
-    color: #040B29;
-  }
-
-  .box-content-index:last-child {
-    margin-bottom: 0;
-  }
-
-  .box-content-color {
-    width: 138px;
-    height: 32px;
-    display: inline-block;
-    border-radius: 4px;
-    text-align: center;
-    font-size: 14px;
-    line-height: 32px;
-  }
-
-  .box-content-Progress {
-    width: 88px;
-    height: 32px;
-    display: inline-block;
-    text-align: center;
-    line-height: 32px;
-    border-radius: 4px;
-    background: #f1f3f5;
-    color: #919399;
-  }
-
-  .accordColor {
-    background: #dbf6e2;
-    color: #26BD4B;
-  }
-
-  .nonConformityColor {
-    background: #f3dddd;
-    color: #E83030;
-  }
-
-  .TrackedColor {
-    background: #f6ebdb;
-    color: #FDA71C;
-  }
-
-  .notInvolvedColor {
-    background: #eef1f4;
-    color: #707486;
-  }
-
-  .submittedColor {
-    color: #00B3BE;
-    background: #ddf3f4;
-  }
-
-  .Current-color {
-    display: inline-block;
-    width: 28px;
-    height: 28px;
-    line-height: 32px;
-    text-align: center;
-    background: #ddf3f4;
-    border-radius: 50%;
-  }
-
-  .Current-color-box {
-    display: inline-block;
-    width: 14px;
-    height: 14px;
-    background: #00B3BE;
-    border-radius: 50%;
-  }
-
-  .box-content-cou {
-    cursor: pointer;
-  }
-
-  .box-content-buttom {
-    width: 100%;
-    overflow: hidden;
-    display: -webkit-box;
-    text-overflow: ellipsis;
-    /*! autoprefixer: off */
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 1;
-    /*! autoprefixer: on;*/
-    text-justify: inter-ideograph;
-    word-break: break-all
-  }
-</style>
-<style>
-  .box-input .ant-select-selection {
-    height: 38px !important;
-  }
-
-  .box-input .ant-select-selection__rendered {
-    line-height: 38px;
-  }
-
-  .taskTable .ant-empty-normal {
-    padding: 32px 0 !important;
-    margin: 0 !important;
-  }
+.headerText {
+  margin-left: 30px;
+  color: #040B29;
+  font-weight: 400;
+}
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/batchModel.vue b/jero-web/src/views/projectManagement/components/batchModel.vue
index 6b10ef02e..0d0252290 100644
--- a/jero-web/src/views/projectManagement/components/batchModel.vue
+++ b/jero-web/src/views/projectManagement/components/batchModel.vue
@@ -1,724 +1,180 @@
+<!--批量维护进度-->
 <template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('standard')">
-                <span>{{$t('standard')}}</span>
-              </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                       v-model="queryParam.serialNumber"></j-input>
+  <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>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('areaOfResponsibility')">
-                <span>{{$t('areaOfResponsibility')}}</span>
-              </div>
-              <j-multi-select-tag class="box-input" v-model="queryParam.dutyTerritory"
-                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                  :type="'select'"
-                                  :triggerChange="false" :dictCode="'duty_territory'"/>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('CertificationProgress')">
-                <span>{{$t('CertificationProgress')}}</span>
-              </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.certificationProgress"
+            <a-form-model-item class="itemModel" :prop="!disabled?'certificationProgress':''">
+              <j-dict-select-tag class="box-input" v-model="formInline.certificationProgress"
+                                 :disabled="disabled"
+                                 @input="handleInput('certificationProgress')"
                                  :placeholder="$t('PleaseSelect')+$t('CertificationProgress')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'certification_progress'"/>
+            </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-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('CurrentStatus')">
-                <span>{{$t('CurrentStatus')}}</span>
-              </div>
-              <a-select
-                class="box-input"
-                v-model="queryParam.projectStatusAssess"
-                :placeholder="$t('PleaseSelect')+$t('CurrentStatus')">
-                <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>
-            </div>
-          </a-col>
-          <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
-               <a-col :md="6" :sm="24">
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
-               </a-col>
-            </span>
-        </a-row>
-      </a-form>
-    </div>
-    <div class="table-operator">
-<!--      <div class="operator-text" @click="batSettingClick">-->
-<!--        <a-icon type="setting"/>-->
-<!--        {{ $t('batSetting') }}-->
-<!--      </div>-->
-      <div @click="BatchMaintenanceProgress" class="operator-text">
-        {{$t('BatchMaintenanceProgress')}}
-      </div>
-      <div @click="BatchChangeStatus" class="operator-text">
-        {{$t('BatchChangeStatus')}}
-      </div>
-      <div @click="CertificationDirectory" class="operator-text">
-        <a-icon type="bulb"/>
-        {{$t('CertificationDirectory')}}
-      </div>
-      <div @click="handleExport" class="operator-text">
-        <a-icon type="export" :rotate="-90"/>
-        {{$t('export')}}
-      </div>
-    </div>
-    <div style="width: 100%">
-      <!--        rowKey="id"
-      :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"-->
-      <a-table
-        ref="table"
-        bordered
-        class="taskTable"
-        :loading="loading"
-        :pagination="false"
-        :scroll="{x: true}"
-        :data-source="dataSource"
-        :columns="columns"
-      >
-        <div slot="standardInformation" slot-scope="text,result" class="box-left">
-          <div class="content">
-            <a class="box-content-a" @click="standardClick(result)"
-               :title="result.serialNumber">{{result.serialNumber}}</a>
-            <a class="box-content-buttom" :title="result.title">{{result.title}}</a>
+            <a-form-model-item class="itemModel" :prop="!disabled?'certificationProgressRemark':''">
+              <a-textarea
+                :placeholder="$t('PleaseEnter')+$t('remarks')"
+                :disabled="disabled"
+                v-model="formInline.certificationProgressRemark" :rows="4"/>
+            </a-form-model-item>
           </div>
-        </div>
-        <div slot="areaOfResponsibility" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.dutyTerritory_dictText">
-            <span v-for="(item,index) in result.dutyTerritory_dictText.split(',')">
-            <span class="box-content-index">{{item}}</span><br/>
-            </span>
-          </div>
-        </div>
-        <div slot="confirmationOfDesignConformity" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.designTaskStatus" @click="verifyTaskClick(result,1,false)">
-            <span class="box-content">{{$t('Deadline')}}: {{result.designDueDate}}</span><br/>
-            <span class="box-content">{{$t('ProcessStatus')}}: {{result.designStatus}}</span><br/>
-            <span class="box-content-color"
-                  :style="{'width':long=='zh-cn'?'78px' : '138px'}"
-                  :class="color[result.designFlowTaskStatus]">
-               {{statusText[result.designFlowTaskStatus]}}
-            </span>
-          </div>
-          <div class="content-box" v-if="result.designTaskStatus == 'NotDone'" @click="verifyTaskClick(result,1,true)">
-            <div class="content-box-jiao"></div>
-          </div>
-        </div>
-        <div slot="PrehomoConfirmation" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.prehomoTaskStatus" @click="verifyTaskClick(result,2,false)">
-            <span class="box-content">{{$t('Deadline')}}: {{result.prehomoDueDate}}</span><br/>
-            <span class="box-content">{{$t('ProcessStatus')}}: {{result.prehomoStatus}}</span><br/>
-            <span class="box-content-color"
-                  :style="{'width':long=='zh-cn'?'78px' : '138px'}"
-                  :class="color[result.prehomoFlowTaskStatus]">
-              {{statusText[result.prehomoFlowTaskStatus]}}
-            </span>
-          </div>
-          <div class="content-box" v-if="result.prehomoTaskStatus == 'NotDone'" @click="verifyTaskClick(result,2,true)">
-            <div class="content-box-jiao"></div>
-          </div>
-        </div>
-        <div slot="verificationAndConformityconfirmation" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.verifyTaskStatus" @click="verifyTaskClick(result,3,false)">
-            <span class="box-content">{{$t('Deadline')}}: {{result.verifyDueDate}}</span><br/>
-            <span class="box-content">{{$t('ProcessStatus')}}: {{result.verifyStatus}}</span><br/>
-            <span class="box-content-color"
-                  :style="{'width':long=='zh-cn'?'78px' : '138px'}"
-                  :class="color[result.verifyFlowTaskStatus]">
-                {{statusText[result.verifyFlowTaskStatus]}}
-            </span>
-          </div>
-          <div class="content-box" v-if="result.verifyTaskStatus == 'NotDone'" @click="verifyTaskClick(result,3,true)">
-            <div class="content-box-jiao"></div>
-          </div>
-        </div>
-        <div slot="CertificationProgress" slot-scope="text,result">
-             <span class="box-content-Progress box-content-cou"
-                   :style="{'width':long=='zh-cn'?'88px' : '108px'}"
-                   :class="CertificationColor[result.certificationProgress]"
-                   @click="CertificationProgressClick(result)"
-             >
-              {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('maintainProgress')}}
-             </span>
-        </div>
-        <div slot="CurrentProjectStatusEvaluation" slot-scope="text,result">
-          <div class="Current-color box-content-cou" :style="{'background':CurrentColor[result.projectStatusAssess]}"
-               @click="CurrentProjectClick(result)">
-            <div class="Current-color-box" :style="{'background':CurrentColorBox[result.projectStatusAssess]}"></div>
-          </div>
-        </div>
-      </a-table>
-    </div>
-    <certificationDirectory :isDisplayNum="isDisplayNum" :url="url" ref="certificationDirectoryRef"/>
-    <TaskListModel @TaskListModelList="TaskListModelList" ref="TaskListModelRef"/>
-    <taskBatSetting @taskBatSettingForm="taskBatSettingForm" ref="taskBatSettingRef"></taskBatSetting>
-  </a-card>
+        </a-col>
+
+      </a-row>
+    </a-form-model>
+  </a-modal>
 </template>
 
 <script>
-  import certificationDirectory from './certificationDirectory'
-  import TaskListModel from './TaskListModel'
-  import taskBatSetting from './taskBatSetting'
-  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
-  import { mapGetters } from 'vuex'
-  import store from '@/store/'
+import { postAction, putAction, getAction } from '@/api/manage'
 
-  export default {
-    name: 'TaskList',
-    components: {
-      certificationDirectory,
-      TaskListModel,
-      taskBatSetting
-    },
-    props: ['isDisplayNum', 'areaOfResponsibility'],
-    data() {
-      return {
-        columns: [
-          {
-            title: this.$t('number'),
-            align: 'center',
-            width: 70,
-            customRender: function(t, r, index) {
-              return parseInt(index) + 1
-            }
-          },
-          {
-            title: this.$t('standardInformation'),
-            align: 'center',
-            dataIndex: 'standard',
-            width: 202,
-            scopedSlots: { customRender: 'standardInformation' }
-          },
-          {
-            title: this.$t('areaOfResponsibility'),
-            align: 'center',
-            width: 180,
-            dataIndex: 'areaOfResponsibility',
-            scopedSlots: { customRender: 'areaOfResponsibility' }
-          },
-          {
-            title: this.$t('confirmationOfDesignConformity'),
-            align: 'center',
-            width: 240,
-            dataIndex: 'confirmationOfDesignConformity',
-            scopedSlots: { customRender: 'confirmationOfDesignConformity' }
-          },
-          {
-            title: this.$t('PrehomoConfirmation'),
-            align: 'center',
-            width: 240,
-            dataIndex: 'PrehomoConfirmation',
-            scopedSlots: { customRender: 'PrehomoConfirmation' }
-          },
-          {
-            title: this.$t('verificationAndConformityconfirmation'),
-            align: 'center',
-            width: 240,
-            dataIndex: 'verificationAndConformityconfirmation',
-            scopedSlots: { customRender: 'verificationAndConformityconfirmation' }
-          },
-          {
-            title: this.$t('CertificationProgress'),
-            align: 'center',
-            width: 150,
-            dataIndex: 'CertificationProgress',
-            scopedSlots: { customRender: 'CertificationProgress' }
-          },
-          {
-            title: this.$t('CurrentStatus'),
-            align: 'center',
-            width: 150,
-            dataIndex: 'CurrentProjectStatusEvaluation',
-            scopedSlots: { customRender: 'CurrentProjectStatusEvaluation' }
-          }
-        ],
-        selectedRowKeys: [],
-        status: {
-          'NotDone': '待办',
-          'haveDone': '已办',
-          'showData': '展示数据'
-        },
-        color: {
-          'Compliance': 'accordColor',
-          'Non-Compliance': 'nonConformityColor',
-          'To be tracked': 'TrackedColor',
-          'NA': 'notInvolvedColor',
-          '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'),
-          'Termination of task': this.$t('taskTermination')
-        },
-        CertificationColor: {
-          'Test passed': 'accordColor',
-          'Test failed': 'nonConformityColor',
-          'In progress': 'TrackedColor',
-          'NA': 'notInvolvedColor',
-          'Not start': 'submittedColor'
-        },
-        queryParam: {},
-        CurrentColor: {
-          '1': '#f3dddd',
-          '2': '#f6ebdb',
-          '3': '#dbf6e2',
-          '4': '#ddf3f4'
-        },
-        CurrentColorBox: {
-          '1': '#E83030',
-          '2': '#FDA71C',
-          '3': '#26BD4B',
-          '4': '#00B3BE'
-        },
-        url: {
-          list: '/project/projectTaskInventoryEO/list',
-          exportXls: '/project/projectTaskInventoryEO/exportXls'
-        },
-        loading: false,
-        dataSource: [],
-        long: ''
-      }
-    },
-    watch: {
-      '$socketPublic.state.msg': {
-        //处理接收到的消息
-        handler: function(res) {
-          let that = this
-          let data = JSON.parse(res.data)
-          if (data.msgId) {
-            this.getList()
-          }
-        }
-      }
-    },
-    created() {
-      if (store.getters.userInfo) {
-        this.$socketPublic.dispatch('webSocketInit')//初始化ws
-      }
-    },
-    mounted() {
-      if (this.areaOfResponsibility.dutyTerritory) {
-        this.queryParam.dutyTerritory = this.areaOfResponsibility.dutyTerritory
-      }
-      this.getList()
-      this.long = localStorage.getItem('language') || 'zh-cn'
-    },
-    methods: {
-      ...mapGetters(['userInfo']),
-      searchQuery() {
-        this.getList()
-      },
-      searchReset() {
-        this.queryParam = {}
-        this.getList()
-      },
-      batSettingClick() {
-        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          this.$refs.taskBatSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
-        } else {
-          this.$message.warning(this.$t('selectLeastOne'))
-        }
-      },
-      taskBatSettingForm() {
-        this.getList()
-      },
-      onSelectChange(value) {
-        this.selectedRowKeys = value
-      },
-      handleExport() {
-        let query = {
-          ...this.queryParam,
-          projectLibraryId: this.$route.query.id
-        }
-        downloadFile(this.url.exportXls, this.$t('taskList') + '.xls', query, this.Deselect)
-      },
-      verifyTaskClick(val, num, isTrue) {
-        let query = {}
-        switch (num) {
-          case 1:
-            query = {
-              taskIds: val.designTaskId,
-              actiProcInstId: val.designPId,
-              projectTaskInventoryId: val.projectLawsInventoryId,
-              projectLibraryId: this.$route.query.id,
-              id: this.$route.query.id,
-              studioEngineer: this.$route.query.studioEngineer,
-              serialNumber: val.serialNumber,
-              TaskKey: val.designTaskDefinitionKey,
-              isDisplay: isTrue,
-              flowType: 2,
-              Sponsor: 'designInitiatorName',
-              personLiable: 'designDutyName',
-              typeOfDeliverables: 'designDeliverableTypeName',
-              deliverableTemplate: 'designDeliverableTemplate',
-              DueDate: 'designDueDate',
-              remarks: 'designRemark',
-              projectName: this.$route.query.projectName,
-              targetMarket: this.$route.query.targetMarket,
-              projectNameId: this.$route.query.projectNameId,
-              primaryKeyId: val.designTaskDetailId,
-              PersonChargeFeedback: val.designPersonChargeFeedback
-            }
-            break
-          case 2:
-            query = {
-              taskIds: val.prehomoTaskId,
-              actiProcInstId: val.prehomoPId,
-              projectTaskInventoryId: val.projectLawsInventoryId,
-              studioEngineer: this.$route.query.studioEngineer,
-              projectLibraryId: this.$route.query.id,
-              serialNumber: val.serialNumber,
-              TaskKey: val.prehomoTaskDefinitionKey,
-              flowType: 3,
-              isDisplay: isTrue,
-              id: this.$route.query.id,
-              Sponsor: 'prehomoInitiatorName',
-              personLiable: 'prehomoDutyName',
-              typeOfDeliverables: 'prehomoDeliverableTypeName',
-              deliverableTemplate: 'prehomoDeliverableTemplate',
-              DueDate: 'prehomoDueDate',
-              remarks: 'prehomoRemark',
-              projectName: this.$route.query.projectName,
-              targetMarket: this.$route.query.targetMarket,
-              projectNameId: this.$route.query.projectNameId,
-              primaryKeyId: val.prehomoTaskDetailId,
-              PersonChargeFeedback: val.prehomoPersonChargeFeedback
-            }
-            break
-          case 3:
-            query = {
-              taskIds: val.verifyTaskId,
-              actiProcInstId: val.verifyPId,
-              id: this.$route.query.id,
-              projectLibraryId: this.$route.query.id,
-              studioEngineer: this.$route.query.studioEngineer,
-              serialNumber: val.serialNumber,
-              projectTaskInventoryId: val.projectLawsInventoryId,
-              TaskKey: val.verifyTaskDefinitionKey,
-              flowType: 4,
-              isDisplay: isTrue,
-              Sponsor: 'verifyInitiatorName',
-              personLiable: 'verifyDutyName',
-              typeOfDeliverables: 'verifyDeliverableTypeName',
-              deliverableTemplate: 'verifyDeliverableTemplate',
-              DueDate: 'verifyDueDate',
-              remarks: 'verifyRemark',
-              projectName: this.$route.query.projectName,
-              targetMarket: this.$route.query.targetMarket,
-              projectNameId: this.$route.query.projectNameId,
-              primaryKeyId: val.verifyTaskDetailId,
-              PersonChargeFeedback: val.verifyPersonChargeFeedback
-            }
-            break
-        }
-        let newUrl = this.$router.resolve({
-          path: '/taskListProcess',
-          query: query
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      CertificationDirectory() {
-        this.$refs.certificationDirectoryRef.addModel()
-      },
-      getList() {
-        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
-        Object.keys(queryParam).forEach(val => {
-          if (queryParam[val] instanceof Array) {
-            queryParam[val] = queryParam[val].join(',')
-          }
-        })
-        if (queryParam.dutyTerritory) {
-          queryParam.dutyTerritory = '*' + queryParam.dutyTerritory + '*'
-        }
-        let query = {
-          projectLibraryId: this.$route.query.id,
-          ...queryParam
-        }
-        this.loading = true
-        getAction(this.url.list, query).then((res) => {
-          if (res.success) {
-            this.dataSource = res.result
-            this.loading = false
-            // this.dataSource = [{}]
-          } else {
-            this.dataSource = []
-            this.loading = false
-          }
-        })
-      },
-      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('CurrentStatus'))
-      },
-      TaskListModelList() {
-        this.getList()
-      },
-      standardClick(row) {
-        let newUrl = this.$router.resolve({
-          path: '/docManage/library/detail',
-          query: {
-            id: row.standId
-          }
-        })
-        window.open(newUrl.href, '_blank')
+export default {
+  name: 'TaskListModel',
+  data() {
+    return {
+      formInline: {},
+      selectionRowsArray:[],
+      rules: {},
+      visible: false,
+      confirmLoading: false,
+      studioList: [],
+      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('BatchMaintenanceProgress')
+      this.selectionRowsArray = 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 }
+        this.$refs.ruleForm.validateField([value])
+      })
+    },
+    handleOk() {
+      if (this.disabled) {
+        this.visible = false
+        return
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          let query = {}
+          let url = ''
+          this.ids = this.selectionRowsArray.join(',')
+            query = {
+              ids: this.ids,
+              certificationProgress: this.formInline.certificationProgress,
+              certificationProgressRemark: this.formInline.certificationProgressRemark
+            }
+            url = this.url.edit
+          this.confirmLoading = true
+          postAction(url, query).then((res) => {
+            if (res.success) {
+              this.visible = false
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$emit('TaskListModelList')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
+        }
+      })
+    }
   }
+}
 </script>
 
-<style lang="less" scoped>
-  @import '~@assets/less/common.less';
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+}
 
-  .box-title-text {
-    line-height: 1.4;
-    display: flex;
-    align-items: center;
-    margin-bottom: 10px;
-  }
+.Required {
+  color: red;
+  margin-right: 4px;
+}
 
-  .title-text {
-    width: 64px;
-    color: #000F16;
-    display: inline-block;
-    font-weight: 500;
-    font-size: 14px;
-    margin-right: 16px;
-    margin-top: 3px;
-    text-align: right;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
+.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;
-    width: calc(100% - 64px);
-    height: 38px;
-    margin-top: 2px;
-  }
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
 
-  .box-button {
-    height: 38px;
-  }
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
 
-  .text-operation {
-    margin-right: 8px;
-  }
+.title-text-text {
+  margin-top: 9px;
+}
 
-  .page {
-    text-align: right;
-    margin-top: 20px;
-  }
-
-  .operator-text-left {
-    font-size: 14px;
-    margin-right: 20px;
-    background: #eff1f3;
-    padding: 8px 8px;
-    cursor: pointer;
-    border-radius: 4px;
-  }
-
-  .box-left {
-    position: relative;
-    display: block;
-    height: 100%;
-    text-align: left;
-  }
-
-  .content {
-    text-align: left;
-    margin: 0 auto;
-    display: inline-block;
-  }
-
-  .content-box {
-    position: absolute;
-    width: calc(100% + 32px);
-    height: calc(100% + 32px);
-    top: -16px;
-    left: -16px;
-    border: 1px #00B3BE solid;
-  }
-
-  .content-box-jiao {
-    position: absolute;
-    right: 0;
-    width: 0;
-    height: 0;
-    border-right: 14px solid #00B3BE;
-    border-bottom: 14px solid transparent
-  }
-
-  .box-content {
-    margin-bottom: 8px;
-    display: inline-block;
-    text-align: left;
-    font-weight: 400;
-    color: #040B29;
-  }
-
-  .box-content-a {
-    display: inline-block;
-    text-align: left;
-    margin-bottom: 8px;
-    font-weight: 400;
-    display: -webkit-box;
-    width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    /*! autoprefixer: off */
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 1;
-    /*! autoprefixer: on;*/
-    text-justify: inter-ideograph;
-    word-break: break-all
-  }
-
-  .box-content-index {
-    margin-bottom: 8px;
-    display: inline-block;
-    text-align: left;
-    font-weight: 400;
-    color: #040B29;
-  }
-
-  .box-content-index:last-child {
-    margin-bottom: 0;
-  }
-
-  .box-content-color {
-    width: 138px;
-    height: 32px;
-    display: inline-block;
-    border-radius: 4px;
-    text-align: center;
-    font-size: 14px;
-    line-height: 32px;
-  }
-
-  .box-content-Progress {
-    width: 88px;
-    height: 32px;
-    display: inline-block;
-    text-align: center;
-    line-height: 32px;
-    border-radius: 4px;
-    background: #f1f3f5;
-    color: #919399;
-  }
-
-  .accordColor {
-    background: #dbf6e2;
-    color: #26BD4B;
-  }
-
-  .nonConformityColor {
-    background: #f3dddd;
-    color: #E83030;
-  }
-
-  .TrackedColor {
-    background: #f6ebdb;
-    color: #FDA71C;
-  }
-
-  .notInvolvedColor {
-    background: #eef1f4;
-    color: #707486;
-  }
-
-  .submittedColor {
-    color: #00B3BE;
-    background: #ddf3f4;
-  }
-
-  .Current-color {
-    display: inline-block;
-    width: 28px;
-    height: 28px;
-    line-height: 32px;
-    text-align: center;
-    background: #ddf3f4;
-    border-radius: 50%;
-  }
-
-  .Current-color-box {
-    display: inline-block;
-    width: 14px;
-    height: 14px;
-    background: #00B3BE;
-    border-radius: 50%;
-  }
-
-  .box-content-cou {
-    cursor: pointer;
-  }
-
-  .box-content-buttom {
-    width: 100%;
-    overflow: hidden;
-    display: -webkit-box;
-    text-overflow: ellipsis;
-    /*! autoprefixer: off */
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 1;
-    /*! autoprefixer: on;*/
-    text-justify: inter-ideograph;
-    word-break: break-all
-  }
-</style>
-<style>
-  .box-input .ant-select-selection {
-    height: 38px !important;
-  }
-
-  .box-input .ant-select-selection__rendered {
-    line-height: 38px;
-  }
-
-  .taskTable .ant-empty-normal {
-    padding: 32px 0 !important;
-    margin: 0 !important;
-  }
+.headerText {
+  margin-left: 30px;
+  color: #040B29;
+  font-weight: 400;
+}
 </style>
\ No newline at end of file