Merge remote-tracking branch 'origin/develop' into develop

src/components/CustomFormComponents/InputForStandards.vue

@@ -57,7 +57,7 @@
               <el-button
                 type="primary"
                 class="common-button-primary"
-                round
+                size="mini"
                 @click="getReplaceLawsNumRowFirst(true)">
                 查询
               </el-button>
@@ -65,8 +65,7 @@
             <el-form-item class="search-item btn-box">
               <el-button
                 class="common-button-default"
-                icon="el-icon-refresh-left"
+                size="mini"
-                round
                 type="default"
                 @click="getResetLawsNumRow">
                 清空
@@ -99,6 +98,7 @@
         </el-table-column>
         <el-table-column
           prop="standName"
+          min-width="300"
           label="标准名称">
         </el-table-column>
         <el-table-column
@@ -125,8 +125,8 @@
         @pageChange="pageChangeReplace"
         @pageSizeChange="pageSizeChangeReplace"></pagination>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
-        <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
+        <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
       </div>
     </el-dialog>
 
@@ -398,6 +398,9 @@ export default {
 </script>
 
 <style scoped lang="less">
+/deep/.el-dialog__body{
+  padding: 15px 20px;
+}
 .add-form-item{
   /deep/.el-form-item__content{
     .el-textarea{

src/components/CustomFormComponents/InputForStandardsForForeign.vue

@@ -9,11 +9,14 @@
       :class="{'form-item-disabled': disabled}"
     >
       <el-input
-        :value="value"
+          :value="value"
-        :placeholder="placeholder"
+          :placeholder="placeholder"
-        :disabled="disabled"
+          :disabled="disabled"
-        clearable
+          clearable
-        @input="handleChange"
+          type="textarea"
+          resize="none"
+          :autosize="true"
+          @input="handleChange"
       ></el-input>
       <el-button
         type="primary"
@@ -50,8 +53,8 @@
             <el-form-item class="search-item btn-box">
               <el-button
                 type="primary"
+                size="mini"
                 class="common-button-primary"
-                round
                 @click="getReplaceLawsNumRow(true)">
                 查询
               </el-button>
@@ -59,8 +62,8 @@
             <el-form-item class="search-item btn-box">
               <el-button
                 class="common-button-default"
-                round
                 type="default"
+                size="mini"
                 @click="getResetLawsNumRow">
                 清空
               </el-button>
@@ -94,7 +97,7 @@
         <el-table-column
           prop="standName"
           label="标准名称"
-          width="130">
+          min-width="300" >
         </el-table-column>
         <el-table-column
           prop="issueTime"
@@ -132,8 +135,8 @@
         @pageChange="pageChangeReplace"
         @pageSizeChange="pageSizeChangeReplace"></pagination>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
-        <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
+        <el-button type="primary"  size="mini" class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
       </div>
     </el-dialog>
 
@@ -371,6 +374,16 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="less"  scoped>
+.add-form-item{
+/deep/.el-form-item__content{
+.el-textarea{
+  width: calc(~'100% - 90px');
+}
+}
+}
+/deep/.el-dialog__body{
+  padding: 15px 20px;
+}
 
 </style>

src/pages/details/complianceDetails/index.vue

@@ -16,6 +16,7 @@
         <el-table-column
           prop="standNumber"
           label="标准号/条款号"
+          width="160"
           align="center"
         >
         </el-table-column>
@@ -34,6 +35,7 @@
         <el-table-column
           prop="researchCompletionTime"
           label="完成时间"
+          width="160"
           align="center"
         >
           <template slot-scope="scope">
@@ -43,12 +45,14 @@
         <el-table-column
           prop="evaluationPeople"
           label="评估人"
+          width="160"
           align="center"
         >
         </el-table-column>
         <el-table-column
           prop="evaluationTime"
           label="评估时间"
+          width="160"
           align="center"
         >
           <template slot-scope="scope">
@@ -73,6 +77,7 @@
          <el-table-column
            prop="standNumber"
            label="标准号/条款号"
+           width="160"
            align="center"
          >
          </el-table-column>
@@ -85,12 +90,14 @@
          <el-table-column
            prop="evaluationPeople"
            label="评估人"
+           width="160"
            align="center"
          >
          </el-table-column>
          <el-table-column
            prop="evaluationTime"
            label="评估时间"
+           width="160"
            align="center"
          >
            <template slot-scope="scope">
@@ -134,7 +141,17 @@ export default {
         }, res => {
           if (res.ok) {
             this.fit = res.data.fit.records
+            this.fit.forEach(item => {
+              if(item.standardItem){
+                  item.standNumber = item.standardItem
+              }
+            })
             this.unfit = res.data.unfit.records
+            this.unfit.forEach(item => {
+              if(item.standardItem){
+                item.standNumber = item.standardItem
+              }
+            })
           } else {
             this.$message.warning(res.message)
           }

src/pages/details/otherBussStandardDetails/index.vue

@@ -127,6 +127,7 @@
                             <el-table
                                 v-if="commentAverageScoreTag === '1'"
                                 :data="qualityHistoryPeopleTable"
+                                empty-text="无人评价"
                                 style="width: 100%"
                                 height="345px"
                                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -135,19 +136,22 @@
                                   prop="historyPeopleName"
                                   align="center"
                                   label="质量评价人"
-                                  width="130px"
+                                  width="200px">
-                              show-overflow-tooltip>
                                 <template slot-scope="scope">
+                                  <el-tooltip class="item" effect="dark" :content="scope.row.processNode" placement="right">
                                   <el-button type="default"
-                                             style="width: 100px;" size="mini" @click="historyPeopleChange(scope.row)">
+                                             style="width: 180px;" size="mini"
-                                    {{ scope.row.userName }}
+                                             @click="historyPeopleChange(scope.row)">
+                                    {{ scope.row.userName + '-' + scope.row.processNode.substring(0,9) }}
                                   </el-button>
+                                  </el-tooltip>
                                 </template>
                               </el-table-column>
                             </el-table>
                             <el-table
                                 v-else-if="commentAverageScoreTag === '2'"
                                 :data="dynamicHistoryPeopleTable"
+                                empty-text="无人评价"
                                 style="width: 100%"
                                 height="345px"
                                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -174,7 +178,9 @@
                                   :summary-method="getSummaries"
                                   show-summary
                                   :span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},qualityHistoryCommentTable))"
-                                  style="width: 100%">
+                                  style="width: 100%"
+                                  :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
+                                   fontWeight: 'bold', height: '48px'}">
                                 <el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
                                   <el-table-column
                                       label="标准代号"
@@ -228,10 +234,8 @@
                                         width = '200'
                                     >
                                       <template slot-scope="scope">
-                                        <el-form-item
+                                        <span v-if="scope.row.targetScore">{{ scope.row.targetScore }}</span>
-                                            :prop="'qualityHistoryCommentTable.'+scope.$index + '.targetScore'">
+                                        <span v-else style="color: #c0c4cc">该用户没有填写分值</span>
-                                          <el-input v-model.number="scope.row.targetScore" placeholder="请填写分值" />
-                                        </el-form-item>
                                       </template>
                                     </el-table-column>
                                     <el-table-column
@@ -250,10 +254,8 @@
                                         label="简述扣分理由（不合格＜6分，必填）"
                                     >
                                       <template slot-scope="scope" v-if="scope.row.valueType !== 'add'">
-                                        <el-form-item
+                                        <span v-if="scope.row.commentReason">{{ scope.row.commentReason }}</span>
-                                            :prop="'qualityHistoryCommentTable.'+scope.$index + '.commentReason'">
+                                        <span v-else style="color: #c0c4cc">该用户没有填写理由</span>
-                                          <el-input v-model="scope.row.commentReason" placeholder="请填写扣分理由" />
-                                        </el-form-item>
                                       </template>
                                     </el-table-column>
                                   </el-table-column>
@@ -291,7 +293,8 @@
                               </el-table-column>
                               <el-table-column property="reason" label="简述理由">
                                 <template slot-scope="scope">
-                                  <el-input clearable size="mini" placeholder="该用户没有填写评分理由" disabled v-model="scope.row.commentReason" />
+                                  <span v-if="scope.row.commentReason">{{scope.row.commentReason}}</span>
+                                  <span v-else style="color: #c0c4cc">该用户没有填写评分理由</span>
                                 </template>
                               </el-table-column>
                             </el-table>
@@ -1292,19 +1295,20 @@ export default {
   data () {
     return {
       commentAverageScoreTag: '1',
-      firstHistoryPeopleId: '',//最新评价的人的id
+      qualityFirstHistoryPeopleId: '',//质量评价最新评价的人的id
+      dynamicFirstHistoryPeopleId: '',//动态评价最新评价的人的id
       historyInfoLoading: false,//历史评价信息的loading
       historyCommentForm: {
         averageScore: 0, // 平均分值
         revise: '',
         reviseReason: '', // 修订理由
       }, // 历史评价表单
-      dynamicHistoryCommentTable: [], // 动态评价历史评价表格
       qualityHistoryCommentTable: [], // 质量评价历史评价表格
-      dynamicHistoryPeopleTable: [], // 动态评价历史评价人表格
+      dynamicHistoryCommentTable: [], // 动态评价历史评价表格
       qualityHistoryPeopleTable: [], // 质量评价历史评价人表格
-      dynamicCommentScore: 0,// 动态评价总平均分
+      dynamicHistoryPeopleTable: [], // 动态评价历史评价人表格
       qualityCommentScore: 0,// 质量评价总平均分
+      dynamicCommentScore: 0,// 动态评价总平均分
       commentActiveName: 'dynamicComment',
       indexType: 'dynamic',
       commentReason: '', // 评价理由
@@ -1535,13 +1539,19 @@ export default {
   methods: {
     historyPeopleChange(row){
       this.historyInfoLoading = true
-      const allData = {
+      const qualityAllData = {
-        lawId: this.sarStandardsInfoEO.id,
+        lawId: this.$route.params.id,
+        userId: row.userId,
+        evaluationType: this.indexType,
+        processNode: row.processNode
+      }
+      const dynamicAllData = {
+        lawId: this.$route.params.id,
         userId: row.userId,
         evaluationType: this.indexType
       }
       if (this.indexType === 'quality'){
-        this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+        this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', qualityAllData , {
           _this: this
         }, res => {
           this.qualityHistoryCommentTable = res.data
@@ -1551,7 +1561,7 @@ export default {
           this.historyInfoLoading = false
         })
       }else  if (this.indexType === 'dynamic'){
-        this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+        this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', dynamicAllData , {
           _this: this
         }, res => {
           this.dynamicHistoryCommentTable = res.data
@@ -1580,9 +1590,10 @@ export default {
         this.indexType = 'quality'
         //查询评分表
         const allData = {
-          lawId: this.sarStandardsInfoEO.id,
+          lawId: this.$route.params.id,
-          userId: this.firstHistoryPeopleId,
+          userId: this.qualityFirstHistoryPeopleId,
-          evaluationType: this.indexType
+          evaluationType: this.indexType,
+          processNode: this.qualityHistoryPeopleTable.length>0?this.qualityHistoryPeopleTable[0].processNode:null
         }
         this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
           _this: this
@@ -1598,8 +1609,8 @@ export default {
         this.indexType = 'dynamic'
         //查询评分表
         const allData = {
-          lawId: this.sarStandardsInfoEO.id,
+          lawId: this.$route.params.id,
-          userId: this.firstHistoryPeopleId,
+          userId: this.dynamicFirstHistoryPeopleId,
           evaluationType: this.indexType
         }
           this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
@@ -1624,7 +1635,7 @@ export default {
       }
 
       //查询动态评价总平均分和质量评价总平均分
-      let standId = this.sarStandardsInfoEO.id
+      let standId = this.$route.params.id
       this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
         _this: this
       }, res => {
@@ -1634,6 +1645,32 @@ export default {
       }, e => {
       })
 
+      // 刷新质量评价评分人表格和动态评价评分人表格
+      const qualityRequest = {
+        lawId: standId,
+        evaluationType: 'quality'
+      }
+      this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, {
+        _this: this
+      }, res => {
+        this.qualityHistoryPeopleTable = res.data.records
+        this.qualityFirstHistoryPeopleId = res.data.records[0].userId
+
+      }, e => {
+      })
+      const dynamicRequest = {
+        lawId: standId,
+        evaluationType: 'dynamic'
+      }
+      this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, {
+        _this: this
+      }, res => {
+        this.dynamicHistoryPeopleTable = res.data.records
+        this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
+
+      }, e => {
+      })
+
     },
     targetScoreChange(row){
       if (this.targetScore1 === '') {
@@ -1714,9 +1751,9 @@ export default {
         const allData = {
           tableData: this.businessCommentTable,
           formData: JSON.stringify(this.businessCommentForm),
-          standId: this.sarStandardsInfoEO.id,
+          standId: this.$route.params.id,
           userId: this.$store.getters.userInfo.userId,
-          evaluationType: this.indexType
+          evaluationType: 'dynamic'
         }
 
         this.$http.postData('sarEnterpriseStandardEvaluation/quality-evaluation/submitEvaluationForm', allData, {
@@ -1726,16 +1763,17 @@ export default {
             this.$message.success('提交成功')
             this.commentSubmitLoading = false
             //重新评分之后刷新历史评分人
-            let standId = this.sarStandardsInfoEO.id
+            let standId = this.$route.params.id
-            this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', {lawId:standId}, {
+            const dynamicRequest = {
+              lawId: standId,
+              evaluationType: 'dynamic'
+            }
+            this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, {
               _this: this
             }, res => {
               this.dynamicHistoryPeopleTable = []
               this.dynamicHistoryPeopleTable = res.data.records
-              this.firstHistoryPeopleId = res.data.records[0].userId
+              this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
-              // for (let i = 0; i < res.data.records.length; i++) {
-              //   this.dynamicHistoryPeopleTable.push(res.data.records[i].userName)
-              // }
 
             }, e => {
             })
@@ -2819,27 +2857,28 @@ export default {
     // }
   },
   async mounted () {
+    let standId = this.$route.params.id
     const qualityRequest = {
-      lawId: this.sarStandardsInfoEO.id,
+      lawId: standId,
       evaluationType: 'quality'
     }
     this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, {
       _this: this
     }, res => {
       this.qualityHistoryPeopleTable = res.data.records
-      this.firstHistoryPeopleId = res.data.records[0].userId
+      this.qualityFirstHistoryPeopleId = res.data.records[0].userId
 
     }, e => {
     })
     const dynamicRequest = {
-      lawId: this.sarStandardsInfoEO.id,
+      lawId: standId,
       evaluationType: 'dynamic'
     }
     this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, {
       _this: this
     }, res => {
       this.dynamicHistoryPeopleTable = res.data.records
-      this.firstHistoryPeopleId = res.data.records[0].userId
+      this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
 
     }, e => {
     })

src/pages/details/otherStandardDetails/index.vue

@@ -672,7 +672,6 @@
           <el-table-column
               type="selection"
               fixed="left"
-              align="center"
               width="60"
           >
           </el-table-column>
@@ -682,18 +681,19 @@
               prop="itemsNum"
               width="90"
               label="条款号"
-              align="center"
           >
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
               prop="itemsName"
+              min-width="300"
               label="条款名称"
           >
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
               prop="termsConditions"
+              min-width="200"
               label="条款内容"
               :resizable="false"
           >
@@ -705,18 +705,16 @@
           </el-table-column>
           <el-table-column
               prop="readContent"
-              width="160"
+              width="170"
               label="核心技术要求/变化点"
               show-overflow-tooltip
-              align="center"
           >
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              align="center"
               prop="comparedWithPrevious"
               label="基于上一版本差异"
-              width="150">
+              width="170">
           </el-table-column>
           <el-table-column
               prop="xccssrq"
@@ -735,10 +733,10 @@
               width="90"
           >
           </el-table-column>
-          <el-table-column
+<!--          <el-table-column-->
-              prop="responsibleUnit"
+<!--              prop="responsibleUnit"-->
-              label="责任部门">
+<!--              label="责任部门">-->
-          </el-table-column>
+<!--          </el-table-column>-->
           <el-table-column
               prop="dutyEngineer"
               label="责任工程师"
@@ -958,22 +956,22 @@
     >
       <div class="see-drawer-content">
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="条款号">条款号</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="条款号">条款号</label>
           <span class="see-drawer-val" :title="standShowItemEO.itemsNum">{{ standShowItemEO.itemsNum }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="条款名称">条款名称</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="条款名称">条款名称</label>
           <span class="see-drawer-val" :title="standShowItemEO.itemsName">{{ standShowItemEO.itemsName }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="内容简介">条款内容</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="内容简介">条款内容</label>
           <span class="see-drawer-val"
                 :title="standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''">{{
               standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="解读内容">解读内容</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="解读内容">解读内容</label>
           <span class="see-drawer-val"
                 :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
             {{
@@ -982,48 +980,48 @@
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="新车型实施日期">新车型实施日期</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="新车型实施日期">新车型实施日期</label>
           <span class="see-drawer-val"
                 :title="standShowItemEO.xcxssrq">{{
-              standShowItemEO.xccssrq ? $moment(standShowItemEO.xccssrq).format('YYYY-MM-DD') : ''
+              standShowItemEO.xccssrq
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="在产车实施日期">在产车实施日期</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="在产车实施日期">在产车实施日期</label>
           <span class="see-drawer-val"
                 :title="standShowItemEO.zccssrq">{{
-              standShowItemEO.zccssrq ? $moment(standShowItemEO.zccssrq).format('YYYY-MM-DD') : ''
+              standShowItemEO.zccssrq
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="适用车型">适用车型</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="适用车型">适用车型</label>
           <span class="see-drawer-val" :title="standShowItemEO.applyArctic">{{ standShowItemEO.applyArctic }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="责任部门">责任部门</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="责任部门">责任部门</label>
           <span class="see-drawer-val" :title="standShowItemEO.responsibleUnit">{{
               standShowItemEO.responsibleUnit
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="责任工程师">责任工程师</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="责任工程师">责任工程师</label>
           <span class="see-drawer-val" :title="standShowItemEO.dutyEngineer">
             {{ standShowItemEO.dutyEngineer }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="基于上一版本差异">基于上一版本差异</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="基于上一版本差异">基于上一版本差异</label>
           <span class="see-drawer-val" :title="standShowItemEO.comparedWithPrevious">
             {{ standShowItemEO.comparedWithPrevious }}</span>
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="符合性状态">符合性状态</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="符合性状态">符合性状态</label>
           <span class="see-drawer-val" :title="standShowItemEO.complianceRequire">
             {{ standShowItemEO.complianceRequire }}</span>
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="合规性分析">合规性分析</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="合规性分析">合规性分析</label>
           <span class="see-drawer-val" :title="standShowItemEO.complianceState">
             {{ standShowItemEO.complianceState }}</span>
         </div>
@@ -3316,7 +3314,7 @@ export default {
 
 /deep/ .el-collapse-item__content {
   padding-bottom: 0px;
-  font-size: 13px;
+  font-size: 16px;
   color: #303133;
   line-height: 1.769230769230769;
 }

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -564,12 +564,12 @@ export default {
           this.newDataList = this.fileTextList
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.fileListData.fileText = this.newDataList

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue

@@ -535,12 +535,12 @@ export default {
           this.newDataList = this.fillFileList
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.rh_pageData.fillFile = this.newDataList

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue

@@ -460,7 +460,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: calc(~'100% - 103px');
+    height: calc(~'100% - 100px');
     overflow: auto;
 
     .tableTitle {

src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue

@@ -375,12 +375,12 @@ export default {
           this.newDataList = this.reData
             this.newDataList.push({
               id: res.data.attId,
-              name: res.data.standName
+              name: res.data.name
           })
         } else {
             this.newDataList.push({
               id: res.data.attId,
-              name: res.data.standName
+              name: res.data.name
             })
         }
 
@@ -449,12 +449,12 @@ export default {
           this.newThemeFile = this.themeData
           this.newThemeFile.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.themeDataList.meetingFile = this.newThemeFile
@@ -510,12 +510,12 @@ export default {
           this.newOtherFile = this.hh_pageData.otherFileList
           this.newOtherFile.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newOtherFile.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.hh_pageData.otherFileList = this.newOtherFile

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -487,12 +487,12 @@ export default {
           this.newDataList = this.ch_pageData.fileTextList
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.ch_pageData.fileTextList = this.newDataList

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -391,20 +391,16 @@
                                 maxlength="500"
                         ></el-input>
                     </el-form-item>
-                    <el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
+                    <custom-date-pick-group
-                        <custom-date-pick-group
+                            class="myDataPick"
-                                class="myDataPick"
+                            :config="{attrName: '新车型实施日期'}"
-                                :config="plForm"
+                            v-model="plForm.newData"
-                                v-model="plForm.newData"
+                    ></custom-date-pick-group>
-                        ></custom-date-pick-group>
+                    <custom-date-pick-group
-                    </el-form-item>
+                            class="myDataPick"
-                    <el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
+                            :config="{attrName: '在产车实施日期'}"
-                        <custom-date-pick-group
+                            v-model="plForm.onlineData"
-                                class="myDataPick"
+                    ></custom-date-pick-group>
-                                :config="plForm"
-                                v-model="plForm.onlineData"
-                        ></custom-date-pick-group>
-                    </el-form-item>
                     <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
                         <el-select multiple  v-model="plForm.applyArctic">
                             <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
@@ -460,20 +456,16 @@
                                 maxlength="500"
                         ></el-input>
                     </el-form-item>
-                    <el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
+                    <custom-date-pick-group
-                        <custom-date-pick-group
+                            class="myDataPick"
-                                class="myDataPick"
+                            :config="{attrName: '新车型实施日期'}"
-                                :config="editForm"
+                            v-model="editForm.newData"
-                                v-model="editForm.newData"
+                    ></custom-date-pick-group>
-                        ></custom-date-pick-group>
+                    <custom-date-pick-group
-                    </el-form-item>
+                            class="myDataPick"
-                    <el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
+                            :config="{attrName: '在产车实施日期'}"
-                        <custom-date-pick-group
+                            v-model="editForm.onlineData"
-                                class="myDataPick"
+                    ></custom-date-pick-group>
-                                :config="editForm"
-                                v-model="editForm.onlineData"
-                        ></custom-date-pick-group>
-                    </el-form-item>
                     <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
                         <el-select multiple  v-model="editForm.applyArctic">
                             <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue

@@ -593,7 +593,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"
@@ -796,7 +796,7 @@ export default {
       ListModel: false, //选择清单抽屉状态
       standModel: false, // 选择标准抽屉状态
       active: "1",
-      signFlag: "1",   //是否会签 1为会签 2为不会签
+      signFlag: "",   //是否会签 1为会签 2为不会签
       listType: "country",  //选择的清单类型
       isSubmit: false,
       saveLoading: false,
@@ -818,7 +818,7 @@ export default {
         model: "", // 上传模板
         modelName: "",
         standId: "", //选择的清单的id
-        signFlag: "1",  //是否会签  1为会签 2为不会签
+        signFlag: "",  //是否会签  1为会签 2为不会签
         inforlist: " ", //用来存放标准列表的标准id
         dataList: [{
           code: "", //标准号
@@ -865,6 +865,7 @@ export default {
           this.fileInfoList.push(itemId)
           this.getFileInfo();
         });
+        this.signFlag = mes.form.signFlag
         this.listForm = mes.form;
         this.dataList = mes.form.dataList;
         this.roleForm = mes.roleForm;
@@ -938,9 +939,9 @@ export default {
     //判断当前是否会签
     selectSign(type) {
       if (type === "1") {
-        this.listForm.signFlag = 1;
+        this.listForm.signFlag = '1';
       } else if (type == "2") {
-        this.listForm.signFlag = 2;
+        this.listForm.signFlag = '2';
       }
     },
     queryDetailsData() {
@@ -1595,5 +1596,9 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue

@@ -101,25 +101,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -181,7 +175,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -319,18 +312,12 @@
                 prop="XCXSSRQ"
                 align="center"
                 label="新车型实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
                 prop="ZCCSSRQ"
                 align="center"
                 label="在产车实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
@@ -527,13 +514,8 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
+          this.$set(item, "ZCCSSRQ", item.zccssrq);
-            this.$set(item, "ZCCSSRQ", '');
+          this.$set(item, "XCXSSRQ", item.xcxssrq);
-            this.$set(item, "XCXSSRQ", '');
-          }else{
-            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-          }
         })
         this.totalNo = res.data.count;
       }, e => {

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue

@@ -97,25 +97,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -177,7 +171,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue

@@ -563,7 +563,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="90%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"
@@ -870,9 +870,9 @@ export default {
     //判断当前是否会签
     selectSign(type) {
       if (type === "1") {
-        this.listForm.signFlag = 1;
+        this.listForm.signFlag = '1';
       } else if (type == "2") {
-        this.listForm.signFlag = 2;
+        this.listForm.signFlag = '2';
       }
     },
     queryDetailsData() {
@@ -1528,5 +1528,9 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>

src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue

@@ -97,25 +97,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -177,7 +171,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue

@@ -116,25 +116,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -196,7 +190,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -293,7 +286,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"
@@ -338,18 +331,12 @@
                 prop="XCXSSRQ"
                 align="center"
                 label="新车型实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
                 prop="ZCCSSRQ"
                 align="center"
                 label="在产车实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
@@ -595,13 +582,8 @@ export default {
         this.standardData = res.data.list;
         this.loading = false
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
+          this.$set(item, "ZCCSSRQ", item.zccssrq);
-            this.$set(item, "ZCCSSRQ", '');
+          this.$set(item, "XCXSSRQ", item.xcxssrq);
-            this.$set(item, "XCXSSRQ", '');
-          }else{
-            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-          }
         })
         this.totalNo = res.data.count;
       }, e => {
@@ -994,6 +976,10 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
 

src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue

@@ -98,25 +98,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -178,7 +172,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -188,11 +188,17 @@
                 prop="planStatus"
                 label="计划状态"
                 align="center">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="reviseStatus"
                 align="center"
                 label="制修订状态">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="drafterName"
@@ -354,10 +360,10 @@ export default {
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafterName = this.selectList[0].drafterName
-        this.qbfsForm.planStatus = this.selectList[0].planStatus
+        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
-        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus
+        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
         this.qbfsForm.unit = this.selectList[0].unit
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         this.ListModel = false

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -204,11 +204,17 @@
                prop="planStatus"
                label="计划状态"
                align="center">
+               <template slot-scope="scope">
+                 <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+               </template>
              </el-table-column>
              <el-table-column
                prop="reviseStatus"
                align="center"
                label="制修订状态">
+               <template slot-scope="scope">
+                 <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+               </template>
              </el-table-column>
              <el-table-column
                prop="drafterName"
@@ -376,10 +382,10 @@ export default {
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafterName = this.selectList[0].drafterName
-        this.qbfsForm.planStatus = this.selectList[0].planStatus
+        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
-        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus
+        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
         this.qbfsForm.unit = this.selectList[0].unit
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         this.ListModel = false

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -23,7 +23,7 @@
             <el-form-item label="计划状态" prop="planStatus1" class="add-form-item form-item-disabled">
               <el-input readonly v-model="qbfsForm.planStatus1" placeholder="请输入计划状态" clearable></el-input>
             </el-form-item>
-            <el-form-item v-show="standShow" label="制修订状态" prop="reviseStatus1" class="add-form-item form-item-disabled">
+            <el-form-item  label="制修订状态" prop="reviseStatus1" class="add-form-item form-item-disabled">
               <el-input readonly v-model="qbfsForm.reviseStatus1" placeholder="请输入制修订状态" clearable></el-input>
             </el-form-item>
           </el-col>
@@ -37,7 +37,7 @@
             <el-form-item label="计划状态" prop="planStatus2" class="add-form-item form-item-disabled">
               <el-input readonly v-model="qbfsForm.planStatus2" placeholder="请输入计划状态" clearable></el-input>
             </el-form-item>
-            <el-form-item v-show="standShow2" label="制修订状态" prop="reviseStatus2" class="add-form-item form-item-disabled">
+            <el-form-item  label="制修订状态" prop="reviseStatus2" class="add-form-item form-item-disabled">
               <el-input readonly v-model="qbfsForm.reviseStatus2" placeholder="请输入制修订状态" clearable></el-input>
             </el-form-item>
           </el-col>
@@ -216,11 +216,17 @@
                 prop="planStatus"
                 label="计划状态"
                 align="center">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="reviseStatus"
                 align="center"
                 label="制修订状态">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="drafterName"
@@ -548,8 +554,8 @@ export default {
         if(this.showType === 'one'){
           this.qbfsForm.esId1 = this.selectList[0].id || '--'
           this.qbfsForm.esName1 = this.selectList[0].esName || '--'
-          this.qbfsForm.planStatus1 = this.selectList[0].planStatus || '--'
+          this.qbfsForm.planStatus1 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
-          this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus || '--'
+          this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
           this.standShow = true
         }else{
           if(this.qbfsForm.esName1 === this.selectList[0].esName ){
@@ -557,8 +563,8 @@ export default {
           }else{
             this.qbfsForm.esId2 = this.selectList[0].id || '--'
             this.qbfsForm.esName2 = this.selectList[0].esName || '--'
-            this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--'
+            this.qbfsForm.planStatus2 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
-            this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--'
+            this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
             this.standShow2 = true
           }
         }

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -195,11 +195,17 @@
                 prop="planStatus"
                 label="计划状态"
                 align="center">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="reviseStatus"
                 align="center"
                 label="制修订状态">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="drafterName"
@@ -364,10 +370,10 @@ export default {
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafterName = this.selectList[0].drafterName
-        this.qbfsForm.planStatus = this.selectList[0].planStatus
+        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
-        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus
+        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
         this.qbfsForm.unit = this.selectList[0].unit
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         this.ListModel = false

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue

@@ -92,6 +92,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.mergeReason"
               placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqDraftTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqReleaseTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.delayReason"
               placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.cancelReason"
               placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.renameReason"
               placeholder="请输入更名原因"

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue

@@ -92,6 +92,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.mergeReason"
               placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqDraftTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqReleaseTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.delayReason"
               placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.cancelReason"
               placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.renameReason"
               placeholder="请输入更名原因"
@@ -163,7 +169,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue

@@ -92,6 +92,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.mergeReason"
               placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqDraftTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqReleaseTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.delayReason"
               placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.cancelReason"
               placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.renameReason"
               placeholder="请输入更名原因"
@@ -163,70 +169,68 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+       <el-table
-        <el-table
+        height="100%"
-          height="100%"
+        ref="selection"
-          ref="selection"
+        :data="detailData"
-          :data="detailData"
+        tooltip-effect="dark"
-          tooltip-effect="dark"
+        style="width: 100%"
-          style="width: 100%"
+        border
-          border
+        row-key="id"
-          row-key="id"
+        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="任务步骤"
+          align="center"
         >
-          <el-table-column
+        </el-table-column>
-            type="selection"
+        <el-table-column
-            width="55"
+          prop="assignee"
-            align="center">
+          label="任务受理人"
-          </el-table-column>
+          align="center"
-          <el-table-column
+        >
-            prop="name"
+        </el-table-column>
-            label="任务步骤"
+        <el-table-column
-            align="center"
+          prop="createTime"
-          >
+          label="创建时间"
-          </el-table-column>
+          sortable="custom"
-          <el-table-column
+          align="center">
-            prop="assignee"
+          <template slot-scope="scope">
-            label="任务受理人"
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
-            align="center"
+          </template>
-          >
+        </el-table-column>
-          </el-table-column>
+        <el-table-column
-          <el-table-column
+          prop="endTime"
-            prop="createTime"
+          label="完成时间"
-            label="创建时间"
+          align="center">
-            sortable="custom"
+          <template slot-scope="scope">
-            align="center">
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
-            <template slot-scope="scope">
+          </template>
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+        </el-table-column>
-            </template>
+        <el-table-column
-          </el-table-column>
+          prop="comment"
-          <el-table-column
+          label="流程信息"
-            prop="endTime"
+          align="center">
-            label="完成时间"
+          <template slot-scope="scope">
-            align="center">
+            <span>{{ scope.row.commentText }}</span>
-            <template slot-scope="scope">
+          </template>
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+        </el-table-column>
-            </template>
+        <el-table-column
-          </el-table-column>
+          prop="completeFlag"
-          <el-table-column
+          label="状态"
-            prop="comment"
+          align="center">
-            label="流程信息"
+          <template slot-scope="scope">
-            align="center">
+            <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
-            <template slot-scope="scope">
+          </template>
-              <span>{{ scope.row.commentText }}</span>
+        </el-table-column>
-            </template>
+      </el-table>
-          </el-table-column>
-          <el-table-column
-            prop="completeFlag"
-            label="状态"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
         <loading :loading="loading">流程列表加载中</loading>
-      </div>
     </div>
     <ProcessFooter
       show-back

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue

@@ -92,6 +92,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.mergeReason"
               placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqDraftTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqReleaseTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.delayReason"
               placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.cancelReason"
               placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.renameReason"
               placeholder="请输入更名原因"
@@ -163,7 +169,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue

@@ -92,6 +92,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.mergeReason"
               placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqDraftTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqReleaseTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.delayReason"
               placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.cancelReason"
               placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.renameReason"
               placeholder="请输入更名原因"
@@ -163,7 +169,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue

@@ -365,6 +365,7 @@ export default {
       this.rowDutyPeople = val
       this.nodeList = []
       this.nodeList.push(id)
+      this.drawerTitle = '选择分发责任人'
       this.modalshowflag = true
     },
     // 选择勾选项的集合

src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue

@@ -6,6 +6,7 @@
       <template slot="proNode">标准法规部领导审批</template>
     </ProcessHeader>
     <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
@@ -198,23 +199,13 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
-          <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
             <el-table-column
               prop="complianceReasons"
               align="center"
@@ -248,43 +239,6 @@
                 </template>
               </el-table-column>
             </el-table-column>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="在产产品">
-            <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
-            </el-table-column>
-            <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
-              <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="170"
-                label="不合规项目">
-              </el-table-column>
-              <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
-              </el-table-column>
-              <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="120"
-                label="完成时间">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
-                </template>
-              </el-table-column>
-            </el-table-column>
-          </el-table-column>
           <el-table-column
             fixed="right"
             align="center"

src/pages/processCenter/pages/creatProcess/xmpg/step3.vue

@@ -142,12 +142,12 @@
         </div>
         <el-table
           ref="multipleTable"
-          :data="listForm.breakdownList"
+          :data="listForm.breakdownList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
-          tooltip-effect="dark"
+          style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          style="width: 100%"
+          height="48%"
           border
+          highlight-current-row
           @selection-change="selectStandChange"
-          :height="sarProStateTableHeight"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
           <el-table-column
@@ -158,53 +158,56 @@
           <el-table-column
             prop="productLine"
             align="center"
+            width="150"
             label="产品线">
           </el-table-column>
           <el-table-column
             prop="projectNumber"
             align="center"
+            width="160px"
             label="项目编号">
           </el-table-column>
           <el-table-column
             prop="projectName"
             align="center"
+            min-width="300"
             label="项目名称">
           </el-table-column>
           <el-table-column
             prop="itemNum"
             align="center"
+            width="100px"
             label="条款号">
           </el-table-column>
           <el-table-column
             prop="itemsName"
             align="center"
+            width="160px"
             label="条款名称">
           </el-table-column>
           <el-table-column
             prop="technicalRequir"
             align="center"
+            width="160px"
             label="核心技术要求/变化点">
           </el-table-column>
           <el-table-column
             prop="changePoint"
             align="center"
+            width="160px"
             label="基于上一版本差异">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
+            prop="xcxssrq"
             align="center"
+            width="120px"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
-            prop="zCCSSRQ"
+            prop="zccssrq"
             align="center"
+            width="120px"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             label="落实人"
@@ -217,7 +220,14 @@
             </template>
           </el-table-column>
         </el-table>
-
+        <el-pagination
+          layout="total,sizes, prev, pager, next"
+          background
+          :page-sizes="[20, 40, 60]"
+          :total="total"
+          @current-change="handleCurrentChange"
+        >
+        </el-pagination>
         <!--    选择责任人-->
         <Role-tree
           is-title="选择落实人"
@@ -336,6 +346,7 @@ export default {
     return {
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
+      currentPage: 1,
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
@@ -366,6 +377,7 @@ export default {
       tabValue: "listOfCountries",
       selectedList: [],  //选择清单的选择框
       selectList: [], //选择标准的选择框
+      selectStandList: [], //点开批量弹窗选择数据丢失
       lsIndex: "",
       lsType: "",
       bringData: [],
@@ -504,6 +516,10 @@ export default {
       });
       window.open(routeUrl.href, "_blank");
     },
+    // 分页
+    handleCurrentChange(currentPage) {
+      this.currentPage = currentPage;
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -532,11 +548,11 @@ export default {
         this.listForm.breakdownList = [];
         for (let i = 0; i < item.pepdtos.length; i++) {
           for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
-            if (item.pepdtos[i].xCXSSRQ === null) {
+            if (item.pepdtos[i].xcxssrq === null) {
-              item.pepdtos[i].xCXSSRQ = "";
+              item.pepdtos[i].xcxssrq = "";
             }
-            if (item.pepdtos[i].zCCSSRQ === null) {
+            if (item.pepdtos[i].zccssrq === null) {
-              item.pepdtos[i].zCCSSRQ = "";
+              item.pepdtos[i].zccssrq = "";
             }
             this.listForm.breakdownList.push({
               itemsName: item.pepdtos[i].breakdownList[j].itemsName,
@@ -558,9 +574,10 @@ export default {
               standNumber: item.pepdtos[i].standNumber,
               standName: item.pepdtos[i].standName,
               id: item.pepdtos[0].id,
-              xCXSSRQ: item.pepdtos[i].XCXSSRQ,
+              xcxssrq: item.pepdtos[i].XCXSSRQ,
-              zCCSSRQ: item.pepdtos[i].ZCCSSRQ
+              zccssrq: item.pepdtos[i].ZCCSSRQ
             });
+            this.total = this.listForm.breakdownList.length
           }
         }
       } else {
@@ -585,7 +602,7 @@ export default {
         this.listForm.breakdownList[this.lsIndex].implementer = nameList;
       } else if (this.type === 2) {
         this.listForm.breakdownList.forEach(item => {
-          this.selectList.forEach(items => {
+          this.selectStandList.forEach(items => {
             if (item === items) {
               item.implementerId = idList;
               item.implementer = nameList;
@@ -600,6 +617,7 @@ export default {
       this.modalshowflag = false;
     },
     choiceZRRS(row, type, index) {
+     this.selectStandList = this.selectList
       this.type = type;
       if (type === 1) {
         this.drawerTitle = "选择责任人";
@@ -659,14 +677,13 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      let standList = []
       this.listForm.breakdownList.forEach(item => {
-        if (item.implementer === null || item.implementer === "" || item.implementer === undefined) {
+        if (item.implementer) {
-          this.sarFlag = false;
+          standList.push(item)
-        } else {
-          this.sarFlag = true;
         }
       });
-      if (this.sarFlag === true) {
+        this.listForm.breakdownList = standList
         this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
         this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
         this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -690,9 +707,6 @@ export default {
           this.isSubmit = false;
         }, e => {
         });
-      } else {
-        this.$message.warning("请选择落实人");
-      }
     },
     drawerCheck(data) {
       var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
@@ -705,6 +719,7 @@ export default {
     },
     //标准表格选择框改变
     selectStandChange(data) {
+      console.log(data);
       this.selectList = data;
     },
     selectThree() {

src/pages/processCenter/pages/creatProcess/xmpg/step4.vue

@@ -203,18 +203,12 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
             <el-table-column
               prop="researchCompliance"

src/pages/processCenter/pages/creatProcess/xmpg/step5.vue

@@ -198,23 +198,13 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            prop="productType"-->
-<!--            align="center"-->
-<!--            label="在研产品">-->
             <el-table-column
               prop="complianceReasons"
               align="center"
@@ -248,43 +238,6 @@
                 </template>
               </el-table-column>
             </el-table-column>
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            align="center"-->
-<!--            label="在产产品">-->
-<!--            <el-table-column-->
-<!--              prop="zcComplianceReasons"-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="合规(具体情况)">-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="不合规">-->
-<!--              <el-table-column-->
-<!--                prop="zcNoCompliance"-->
-<!--                align="center"-->
-<!--                width="170"-->
-<!--                label="不合规项目">-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="zcCountermeasures"-->
-<!--                align="center"-->
-<!--                width="160"-->
-<!--                label="应对措施">-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="zcCompletionTime"-->
-<!--                align="center"-->
-<!--                width="120"-->
-<!--                label="完成时间">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--            </el-table-column>-->
-<!--          </el-table-column>-->
           <el-table-column
             fixed="right"
             align="center"

src/pages/processCenter/pages/creatProcess/xmpg/step6.vue

@@ -198,23 +198,13 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            prop="productType"-->
-<!--            align="center"-->
-<!--            label="在研产品">-->
             <el-table-column
               prop="complianceReasons"
               align="center"
@@ -248,43 +238,6 @@
                 </template>
               </el-table-column>
             </el-table-column>
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            align="center"-->
-<!--            label="在产产品">-->
-<!--            <el-table-column-->
-<!--              prop="zcComplianceReasons"-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="合规(具体情况)">-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="不合规">-->
-<!--              <el-table-column-->
-<!--                prop="zcNoCompliance"-->
-<!--                align="center"-->
-<!--                width="170"-->
-<!--                label="不合规项目">-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="zcCountermeasures"-->
-<!--                align="center"-->
-<!--                width="160"-->
-<!--                label="应对措施">-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="zcCompletionTime"-->
-<!--                align="center"-->
-<!--                width="120"-->
-<!--                label="完成时间">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--            </el-table-column>-->
-<!--          </el-table-column>-->
           <el-table-column
             fixed="right"
             align="center"

src/pages/processCenter/pages/creatProcess/xmpg/step7.vue

@@ -198,23 +198,13 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            prop="productType"-->
-<!--            align="center"-->
-<!--            label="在研产品">-->
             <el-table-column
               prop="complianceReasons"
               align="center"
@@ -248,43 +238,6 @@
                 </template>
               </el-table-column>
             </el-table-column>
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            align="center"-->
-<!--            label="在产产品">-->
-<!--            <el-table-column-->
-<!--              prop="zcComplianceReasons"-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="合规(具体情况)">-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="不合规">-->
-<!--              <el-table-column-->
-<!--                prop="zcNoCompliance"-->
-<!--                align="center"-->
-<!--                width="170"-->
-<!--                label="不合规项目">-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="zcCountermeasures"-->
-<!--                align="center"-->
-<!--                width="160"-->
-<!--                label="应对措施">-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="zcCompletionTime"-->
-<!--                align="center"-->
-<!--                width="120"-->
-<!--                label="完成时间">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--            </el-table-column>-->
-<!--          </el-table-column>-->
           <el-table-column
             fixed="right"
             align="center"

src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue

@@ -116,7 +116,6 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
           </el-table-column>
           <el-table-column
@@ -128,7 +127,6 @@
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
           </el-table-column>
@@ -600,47 +598,48 @@ export default {
       })
       if(!fileFlag){
         this.$message.warning('请选择分解单来源')
+      }else{
+        if (this.listForm.dataList.length < 1) {
+          this.$message.warning("请选择带标准的项目");
+        } else {
+          this.listForm.commentText = this.commentText;
+          var json = Object.assign(this.listForm, this.roleForm);
+          json.prcCreateUser = this.$store.getters.userInfo.userId;
+          json.prcCreateUserName = this.$store.getters.userInfo.userName;
+          json.standId = this.listForm.standId;
+          this.$refs["listForm"].validate((valid) => {
+            if (valid) {
+              this.$refs["roleForm"].validate((valid) => {
+                if (valid) {
+                  this.isSubmit = true;
+                  this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+                    _this: this
+                  }, res => {
+                    if (res.ok) {
+                      this.$http.post("lawss/activiti/completeTask", {
+                        taskIds: res.data,
+                        userId: this.$store.getters.userInfo.userId,
+                        json: JSON.stringify(json)
+                      }, {
+                        _this: this
+                      }, res => {
+                        if (res.success) {
+                          this.$message.success(res.message);
+                          this.$router.push("/processCenter");
+                        }
+                        this.isSubmit = false;
+                      });
+                    }
+                  });
+                } else {
+                  return this.$message.warning("请完善人员信息");
+                }
+              });
+            } else {
+              return this.$message.warning("请完善基础信息");
+            }
+          });
       }
-      if (this.listForm.dataList.length < 1) {
-        this.$message.warning("请选择带标准的项目");
-      } else {
-        this.listForm.commentText = this.commentText;
-        var json = Object.assign(this.listForm, this.roleForm);
-        json.prcCreateUser = this.$store.getters.userInfo.userId;
-        json.prcCreateUserName = this.$store.getters.userInfo.userName;
-        json.standId = this.listForm.standId;
-        this.$refs["listForm"].validate((valid) => {
-          if (valid) {
-            this.$refs["roleForm"].validate((valid) => {
-              if (valid) {
-                this.isSubmit = true;
-                this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
-                  _this: this
-                }, res => {
-                  if (res.ok) {
-                    this.$http.post("lawss/activiti/completeTask", {
-                      taskIds: res.data,
-                      userId: this.$store.getters.userInfo.userId,
-                      json: JSON.stringify(json)
-                    }, {
-                      _this: this
-                    }, res => {
-                      if (res.success) {
-                        this.$message.success(res.message);
-                        this.$router.push("/processCenter");
-                      }
-                      this.isSubmit = false;
-                    });
-                  }
-                });
-              } else {
-                return this.$message.warning("请完善人员信息");
-              }
-            });
-          } else {
-            return this.$message.warning("请完善基础信息");
-          }
-        });
       }
     },
     choiceZRR(type, title, id) {

src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue

@@ -93,22 +93,22 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
             <el-table-column
               prop="complianceReasons"
@@ -208,7 +208,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue

@@ -86,7 +86,6 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
@@ -104,7 +103,6 @@
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
             <template slot-scope="scope">
@@ -169,7 +167,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue

@@ -126,7 +126,6 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
           </el-table-column>
           <el-table-column
@@ -138,7 +137,6 @@
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
           </el-table-column>
@@ -617,47 +615,48 @@ export default {
         })
       if(!fileFlag){
          this.$message.warning('请选择分解单来源')
+      }else{
+        if (this.listForm.dataList.length < 1) {
+          this.$message.warning("请选择带标准的项目");
+        } else {
+          this.listForm.commentText = this.commentText;
+          var json = Object.assign(this.listForm, this.roleForm);
+          json.prcCreateUser = this.$store.getters.userInfo.userId;
+          json.prcCreateUserName = this.$store.getters.userInfo.userName;
+          json.standId = this.listForm.standId;
+          this.$refs["listForm"].validate((valid) => {
+            if (valid) {
+              this.$refs["roleForm"].validate((valid) => {
+                if (valid) {
+                  this.isSubmit = true;
+                  this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+                    _this: this
+                  }, res => {
+                    if (res.ok) {
+                      this.$http.post("lawss/activiti/completeTask", {
+                        taskIds: res.data,
+                        userId: this.$store.getters.userInfo.userId,
+                        json: JSON.stringify(json)
+                      }, {
+                        _this: this
+                      }, res => {
+                        if (res.success) {
+                          this.$message.success(res.message);
+                          this.$router.push("/processCenter");
+                        }
+                        this.isSubmit = false;
+                      });
+                    }
+                  });
+                } else {
+                  return this.$message.warning("请完善人员信息");
+                }
+              });
+            } else {
+              return this.$message.warning("请完善基础信息");
+            }
+          });
       }
-      if (this.listForm.dataList.length < 1) {
-        this.$message.warning("请选择带标准的项目");
-      } else {
-        this.listForm.commentText = this.commentText;
-        var json = Object.assign(this.listForm, this.roleForm);
-        json.prcCreateUser = this.$store.getters.userInfo.userId;
-        json.prcCreateUserName = this.$store.getters.userInfo.userName;
-        json.standId = this.listForm.standId;
-        this.$refs["listForm"].validate((valid) => {
-          if (valid) {
-            this.$refs["roleForm"].validate((valid) => {
-              if (valid) {
-                this.isSubmit = true;
-                this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
-                  _this: this
-                }, res => {
-                  if (res.ok) {
-                    this.$http.post("lawss/activiti/completeTask", {
-                      taskIds: res.data,
-                      userId: this.$store.getters.userInfo.userId,
-                      json: JSON.stringify(json)
-                    }, {
-                      _this: this
-                    }, res => {
-                      if (res.success) {
-                        this.$message.success(res.message);
-                        this.$router.push("/processCenter");
-                      }
-                      this.isSubmit = false;
-                    });
-                  }
-                });
-              } else {
-                return this.$message.warning("请完善人员信息");
-              }
-            });
-          } else {
-            return this.$message.warning("请完善基础信息");
-          }
-        });
       }
     },
     // 点击查看

src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -95,23 +94,23 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--            prop="productType"-->
@@ -477,9 +476,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+          this.dataList.push(item)
-            this.dataList.push(item)
-          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -487,6 +484,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })

src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -95,23 +94,23 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--            prop="productType"-->
@@ -456,7 +455,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -476,9 +474,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+          this.dataList.push(item)
-            this.dataList.push(item)
-          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -486,6 +482,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })

src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -95,23 +94,23 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--            prop="productType"-->
@@ -477,9 +476,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+          this.dataList.push(item)
-            this.dataList.push(item)
-          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -487,6 +484,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })

src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue

@@ -86,30 +86,19 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="190px"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zrbm"
@@ -169,7 +158,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue

@@ -98,11 +98,19 @@
           <el-table-column
             prop="ssrq"
             align="center"
-            sortable
             label="标准实施日期">
-            <template slot-scope="scope">
+          </el-table-column>
-              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+          <el-table-column
-            </template>
+            prop="xcxssrq"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            align="center"
+            width="190px"
+            label="在产车实施日期">
           </el-table-column>
           <el-table-column
             prop="zrbm"
@@ -161,7 +169,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue

@@ -96,11 +96,19 @@
           <el-table-column
             prop="ssrq"
             align="center"
-            sortable
             label="标准实施日期">
-            <template slot-scope="scope">
+          </el-table-column>
-              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+          <el-table-column
-            </template>
+            prop="xcxssrq"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            align="center"
+            width="190px"
+            label="在产车实施日期">
           </el-table-column>
           <el-table-column
             prop="zrbm"
@@ -169,7 +177,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
@@ -448,7 +455,6 @@ export default {
         this.isSubmit = true;
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
-        console.log(json);
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,

src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

@@ -52,7 +52,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -104,28 +103,24 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
-          <!--          <el-table-column-->
-          <!--            prop="productType"-->
-          <!--            align="center"-->
-          <!--            label="在研产品">-->
           <el-table-column
             prop="researchCompliance"
             align="center"
@@ -225,115 +220,6 @@
               </template>
             </el-table-column>
           </el-table-column>
-          <!--          </el-table-column>-->
-          <!--          <el-table-column-->
-          <!--            align="center"-->
-          <!--            label="在产产品">-->
-          <!--            <el-table-column-->
-          <!--              prop="productionCompliance"-->
-          <!--              align="center"-->
-          <!--              width="160"-->
-          <!--              label="合规(具体情况)">-->
-          <!--              <template slot-scope="scope">-->
-          <!--                <el-input-->
-          <!--                    v-if="scope.row.zcNoCompliance && scope.row.zcNoCompliance.length>0-->
-          <!--                    || scope.row.zcCountermeasures && scope.row.zcCountermeasures>0-->
-          <!--                    || scope.row.zcCompletionTime && scope.row.zcCompletionTime !== null"-->
-          <!--                    disabled-->
-          <!--                  v-model="scope.row.zcComplianceReasons"-->
-          <!--                  placeholder="请输入合规原因"-->
-          <!--                >-->
-          <!--                </el-input>-->
-          <!--                <el-input-->
-          <!--                    v-else-->
-          <!--                    v-model="scope.row.zcComplianceReasons"-->
-          <!--                    placeholder="请输入合规原因"-->
-          <!--                >-->
-          <!--                </el-input>-->
-          <!--              </template>-->
-          <!--            </el-table-column>-->
-          <!--            <el-table-column-->
-          <!--              align="center"-->
-          <!--              width="160"-->
-          <!--              label="不合规">-->
-          <!--              <el-table-column-->
-          <!--                prop="productionNonCompliance"-->
-          <!--                align="center"-->
-          <!--                width="170"-->
-          <!--                label="不合规项目">-->
-          <!--                <template slot-scope="scope">-->
-          <!--                  <el-input-->
-          <!--                      v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
-          <!--                      disabled-->
-          <!--                    v-model="scope.row.zcNoCompliance"-->
-          <!--                    placeholder="请输入不合规项目"-->
-          <!--                  >-->
-          <!--                  </el-input>-->
-          <!--                  <el-input-->
-          <!--                      v-else-->
-          <!--                      v-model="scope.row.zcNoCompliance"-->
-          <!--                      placeholder="请输入不合规项目"-->
-          <!--                  >-->
-          <!--                  </el-input>-->
-          <!--                </template>-->
-          <!--              </el-table-column>-->
-          <!--              <el-table-column-->
-          <!--                prop="productionCountermeasures"-->
-          <!--                align="center"-->
-          <!--                width="160"-->
-          <!--                label="应对措施">-->
-          <!--                <template slot-scope="scope">-->
-          <!--                  <el-input-->
-          <!--                      v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
-          <!--                      disabled-->
-          <!--                    v-model="scope.row.zcCountermeasures"-->
-          <!--                    placeholder="请输入应对措施"-->
-          <!--                  >-->
-          <!--                  </el-input>-->
-          <!--                  <el-input-->
-          <!--                      v-else-->
-          <!--                      v-model="scope.row.zcCountermeasures"-->
-          <!--                      placeholder="请输入应对措施"-->
-          <!--                  >-->
-          <!--                  </el-input>-->
-          <!--                </template>-->
-          <!--              </el-table-column>-->
-          <!--              <el-table-column-->
-          <!--                prop="productionCompletionTime"-->
-          <!--                align="center"-->
-          <!--                width="140"-->
-          <!--                label="完成时间">-->
-          <!--                <template slot-scope="scope">-->
-          <!--                  <el-date-picker-->
-          <!--                      v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
-          <!--                      disabled-->
-          <!--                    v-model="scope.row.zcCompletionTime"-->
-          <!--                    type="date"-->
-          <!--                    placeholder="请选择日期">-->
-          <!--                  </el-date-picker>-->
-          <!--                  <el-date-picker-->
-          <!--                      v-else-->
-          <!--                      class="datePickLen"-->
-          <!--                      clearable-->
-          <!--                      v-model="scope.row.zcCompletionTime"-->
-          <!--                      type="date"-->
-          <!--                      placeholder="请选择日期">-->
-          <!--                  </el-date-picker>-->
-          <!--                </template>-->
-          <!--              </el-table-column>-->
-          <!--            </el-table-column>-->
-          <!--          </el-table-column>-->
-          <!--          以后全选可能用-->
-          <!--          <el-table-column-->
-          <!--              prop="productionCompletionTime"-->
-          <!--              align="center"-->
-          <!--              fixed="right"-->
-          <!--              width="160"-->
-          <!--              label="操作">-->
-          <!--            <template slot-scope="scope">-->
-          <!--              <el-button style="width: 98%" size="small" type="primary" @click="">{{ "批量编辑" }}</el-button>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
         </el-table>
         <el-pagination
           layout="total,sizes, prev, pager, next"
@@ -804,7 +690,7 @@ export default {
           this.listForm["id"] = item.id;
           this.listForm.dataList = item.dataList;
           this.listForm.dataList.forEach(item => {
-            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+            if(item.workPeopleId === this.$store.getters.userInfo.userId ){
                 this.dataList.push(item)
             }
               item.children.forEach(items=> {
@@ -814,6 +700,9 @@ export default {
                   this.$set(items, "standYear", item.standYear);
                   this.$set(items, "standSort", item.standSort);
                   this.$set(items, "standNumber", item.standNumber);
+                  this.$set(items, "zccssrq", item.zccssrq);
+                  this.$set(items, "xcxssrq", item.xcxssrq);
+                  this.$set(items, "ssrq", item.ssrq);
                 }
               })
           })

src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -95,23 +94,23 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
             <el-table-column
               prop="complianceReasons"
@@ -436,9 +435,7 @@ export default {
           this.listForm["id"] = item.id;
           this.listForm.dataList = item.dataList;
           this.listForm.dataList.forEach(item => {
-            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+            this.dataList.push(item)
-              this.dataList.push(item)
-            }
             item.children.forEach(items=> {
               if(items.key === item.standId){
                 this.$set(items, "standName", item.standName);
@@ -446,6 +443,9 @@ export default {
                 this.$set(items, "standYear", item.standYear);
                 this.$set(items, "standSort", item.standSort);
                 this.$set(items, "standNumber", item.standNumber);
+                this.$set(items, "zccssrq", item.zccssrq);
+                this.$set(items, "xcxssrq", item.xcxssrq);
+                this.$set(items, "ssrq", item.ssrq);
               }
             })
           })

src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -95,23 +94,23 @@
                   align="center"
                   label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
                   prop="xcxssrq"
                   width="200"
                   align="center"
                   label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
                   prop="zccssrq"
                   width="200"
                   align="center"
                   label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--                  prop="productType"-->
@@ -475,9 +474,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+          this.dataList.push(item)
-            this.dataList.push(item)
-          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -485,6 +482,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })

src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -95,23 +94,23 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--            prop="productType"-->
@@ -477,9 +476,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+          this.dataList.push(item)
-            this.dataList.push(item)
-          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -487,6 +484,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -368,7 +368,7 @@
             align="center"
             label="适用产品线">
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
             show-overflow-tooltip
             prop="cycvppsbm"
             width="210px"
@@ -395,7 +395,7 @@
             align="center"
             width="210px"
             label="卡车VPPS中文名称">
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column width="240" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
@@ -463,6 +463,7 @@
 
     <el-drawer
         title="编辑清单条目"
+        :before-close='cancelInfo'
         :visible.sync="drawerEdit"
         :wrapperClosable="false"
         size="800px"
@@ -486,7 +487,7 @@
         <el-form-item label="标准实施日期" prop="putTime">
           <el-date-picker
               v-model.trim="editRowData.ssrq"
-              type="date"
+              type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
@@ -494,7 +495,7 @@
         <el-form-item label="在产车实施日期" prop="zccssrqgj">
           <el-date-picker
               v-model.trim="editRowData.zccssrqgj"
-              type="date"
+              type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
@@ -502,7 +503,7 @@
         <el-form-item label="新车型实施日期" prop="xcxssrqgj">
           <el-date-picker
               v-model.trim="editRowData.xcxssrqgj"
-              type="date"
+              type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
@@ -513,7 +514,7 @@
         <el-form-item label="适用产品线" prop="sycpx">
           <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
           <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
         </el-form-item>
         <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
@@ -524,7 +525,7 @@
         </el-form-item>
         <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
           <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div class="demo-drawer-footer">
         <el-button
@@ -914,6 +915,7 @@ export default {
       allSelectOptions: {},
       dynamicFormField: [], // 动态数据
       uuid: '',
+      rowList: {}
     }
   },
   created() {
@@ -1257,7 +1259,6 @@ export default {
             this.$message.warning('请勿添加重复数据')
           } else {
             this.sarAccessInfoList.push(item)
-            console.log('1270',this.sarAccessInfoList)
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
@@ -1294,18 +1295,41 @@ export default {
     },
     // 编辑按钮
     editTghisRow(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standNumber
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
+      }
+      if (this.editRowData.zccssrqgj !== null) {
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null) {
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+      }
       this.drawerEdit = true
     },
     // 抽屉取消按钮
     cancelInfo() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editRowData.ssrq = Item.ssrq
+      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.zccssrqgj = Item.zccssrqgj
       this.drawerEdit = false
     },
     // 抽屉提交按钮
     saveInfo() {
-      this.rowList = this.editRowData
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null){
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+      }
+      if (this.editRowData.zccssrqgj !== null){
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+      }
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
@@ -1377,23 +1401,25 @@ export default {
             if (this.sarAccessInfoList[i].ssrq === null || this.sarAccessInfoList[i].ssrq === undefined) {
               rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             } else {
-              rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
+              rowlist1.push(this.sarAccessInfoList[i].ssrq)
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
             } else {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
             }
             if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
             } else {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
             }
           }
+          console.log(rowlist1)
           rowlist = rowlist.join(',')
-          rowlist1 = rowlist1.join(',')
+          rowlist1 = rowlist1.join(';')
-          rowlist2 = rowlist2.join(',')
+          console.log(rowlist1)
-          rowlist3 = rowlist3.join(',')
+          rowlist2 = rowlist2.join(';')
+          rowlist3 = rowlist3.join(';')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = rowlist
           sarAccessEO.inforlist1 = rowlist1
@@ -1586,7 +1612,6 @@ export default {
     //   })
     // },
     pageInfo() {
-      console.log('1598',this.sarAccessInfoSearch)
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
           this.sarAccessInfoSearchList = res.data.list
@@ -1629,7 +1654,6 @@ export default {
         this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
           _this: this,
         }, res => {
-          console.log('1640',res)
           this.sarAccessInfoSearchList = res.data.list
           this.drawerTotal = res.data.count
         }, e => {
@@ -2433,6 +2457,9 @@ export default {
     background: #ffffff;
     text-align: right;
   }
+  /deep/.el-date-editor.el-input {
+    width: 100%;
+  }
 }
 
 .labelBox {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -180,12 +180,6 @@
             width="210px"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span v-if="scope.row.zccssrqgj === null">
-                {{ scope.row.zccssrqgj }}
-              </span>
-              <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="xcxssrqgj"
@@ -193,12 +187,6 @@
             align="center"
             width="210px"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span v-if="scope.row.xcxssrqgj === null">
-                {{ scope.row.xcxssrqgj }}
-              </span>
-              <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -214,34 +202,6 @@
             align="center"
             label="适用产品线">
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="cycvppsbm"
-            width="210px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="cycvppscn"
-            width="210px"
-            align="center"
-            label="乘用车VPPS中文名称">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppsbm"
-            align="center"
-            width="210px"
-            label="卡车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppscn"
-            align="center"
-            width="210px"
-            label="卡车VPPS中文名称">
-          </el-table-column>
         </el-table>
         <pagination :page="standardForm.page" :total="standardFormTotal" @pageChange="pageChange"
                     @pageSizeChange="pageSizeChange"></pagination>

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -341,7 +341,7 @@
           align="center"
           label="适用产品线">
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
           show-overflow-tooltip
           prop="cycvppsbm"
           width="210px"
@@ -368,7 +368,7 @@
           align="center"
           width="210px"
           label="卡车VPPS中文名称">
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column width="240" align="center"  fixed="right"  label="操作">
           <template slot-scope="scope">
             <el-button
@@ -430,6 +430,7 @@
       title="编辑清单条目"
       :visible.sync="drawerEdit"
       :wrapperClosable="false"
+      :before-close='cancelInfo'
       size="800px"
     >
       <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
@@ -478,7 +479,7 @@
         <el-form-item label="适用产品线" prop="sycpx">
           <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
           <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
         </el-form-item>
         <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
@@ -489,7 +490,7 @@
         </el-form-item>
         <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
           <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div class="demo-drawer-footer">
         <el-button
@@ -1228,18 +1229,41 @@ export default {
     },
     // 编辑按钮
     editTghisRow(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standNumber
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
+      }
+      if (this.editRowData.zccssrqgj !== null) {
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null) {
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+      }
       this.drawerEdit = true
     },
     // 抽屉取消按钮
     cancelInfo() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editRowData.ssrq = Item.ssrq
+      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.zccssrqgj = Item.zccssrqgj
       this.drawerEdit = false
     },
     // 抽屉提交按钮
     saveInfo() {
-      this.rowList = this.editRowData
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null){
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+      }
+      if (this.editRowData.zccssrqgj !== null){
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+      }
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
@@ -1324,9 +1348,9 @@ export default {
             }
           }
           rowlist = rowlist.join(',')
-          rowlist1 = rowlist1.join(',')
+          rowlist1 = rowlist1.join(';')
-          rowlist2 = rowlist2.join(',')
+          rowlist2 = rowlist2.join(';')
-          rowlist3 = rowlist3.join(',')
+          rowlist3 = rowlist3.join(';')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = rowlist
           sarAccessEO.inforlist1 = rowlist1

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -399,7 +399,7 @@
             align="center"
             label="适用产品线">
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
             show-overflow-tooltip
             prop="cycvppsbm"
             width="210px"
@@ -426,7 +426,7 @@
             align="center"
             width="210px"
             label="卡车VPPS中文名称">
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column width="240" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
@@ -494,6 +494,7 @@
     <el-drawer
         title="编辑清单条目"
         :visible.sync="drawerEdit"
+        :before-close='cancelInfo'
         :wrapperClosable="false"
         size="800px"
     >
@@ -543,7 +544,7 @@
         <el-form-item label="适用产品线" prop="sycpx">
           <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
           <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
         </el-form-item>
         <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
@@ -554,7 +555,7 @@
         </el-form-item>
         <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
           <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div class="demo-drawer-footer">
         <el-button
@@ -1227,18 +1228,40 @@ export default {
     },
     // 编辑按钮
     editTghisRow(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standNumber
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
+      }
+      if (this.editRowData.zccssrqgj !== null) {
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null) {
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+      }
       this.drawerEdit = true
     },
     // 抽屉取消按钮
     cancelInfo() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editRowData.ssrq = Item.ssrq
+      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.zccssrqgj = Item.zccssrqgj
       this.drawerEdit = false
     },
     // 抽屉提交按钮
     saveInfo() {
-      this.rowList = this.editRowData
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null){
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+      }
+      if (this.editRowData.zccssrqgj !== null){
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+      }
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
@@ -1324,9 +1347,9 @@ export default {
             }
           }
           rowlist = rowlist.join(',')
-          rowlist1 = rowlist1.join(',')
+          rowlist1 = rowlist1.join(';')
-          rowlist2 = rowlist2.join(',')
+          rowlist2 = rowlist2.join(';')
-          rowlist3 = rowlist3.join(',')
+          rowlist3 = rowlist3.join(';')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = rowlist
           sarAccessEO.inforlist1 = rowlist1

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -549,6 +549,7 @@
                       :disabled="formdisableflag"
                   ></custom-date-pick-group>
                 </template>
+<!--                关联信息-代替标准号-->
                 <template
                     v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'CHJL'">
                   <template
@@ -754,6 +755,9 @@
                                   :key="field.attrField"
                                   :config="field"
                                   clearable
+                                  type="textarea"
+                                  resize="none"
+                                  :autosize="true"
                                   v-model="sarStandardsInfoEO['QCDW']"
                                   :disabled="formdisableflag" placeholder="选择或输入起草单位">
                           </el-input>
@@ -5185,16 +5189,17 @@ export default {
           rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}]
         }
         if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {
-          if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') {
+
-            rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'})
+          // if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') {
-          } else {
+          //   rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'})
-            rule.push({
+          // } else {
-              type: 'string',
+          //   rule.push({
-              max: item.attrLen,
+          //     type: 'string',
-              message: `${item.attrName}不能超过${item.attrLen}个字符`,
+          //     max: item.attrLen,
-              trigger: 'blur'
+          //     message: `${item.attrName}不能超过${item.attrLen}个字符`,
-            })
+          //     trigger: 'blur'
-          }
+          //   })
+          // }
         }
         if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH') {
           // rule.push({validator: this.verify.validateStandardItem, trigger: 'blur'})

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -233,7 +233,7 @@
 <!--        ><i class="iconfont">&#xe6de;</i>导入</el-button>-->
         <el-button
           class="common-button-default export-button"
-          round
+          size="mini"
           @click="exportStandard"
           title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
           v-btn-permission="'784d26f527a659eefe84d5e5a53deb96'"
@@ -247,20 +247,20 @@
 <!--        ><i class="iconfont">&#xe825;</i>模板下载</el-button>-->
         <el-button
             class="common-button-default delete-button"
-            round
+            size="mini"
             @click="deleteStand(2)"
             v-btn-permission="'374205ce36a859a158ca4db196d151b7'"
         ><i class="iconfont">&#xe61b;</i>批量删除
         </el-button>
         <el-button
           class="common-button-default"
-          round
+          size="mini"
           @click="configurationStandard"
           v-btn-permission="'381d34443196ca840118ae577ff30d5e'"
         ><i class="iconfont">&#xe669;</i>配置标准</el-button>
         <el-button
           class="common-button-default"
-          round
+          size="mini"
           @click="deleteEnterStandFromKind(2)"
           v-btn-permission="'2d41ebdb6150ba1af52fd753086d77dc'"
         ><i class="iconfont">&#xe611;</i>移除标准</el-button>

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -17,7 +17,7 @@
               :indent="0"
               :props="props"
               :data="treeList"
-              default-expanded-keys="['2']"
+              :default-expanded-keys="['2']"
               highlight-current
               @node-click="treeClick"
               :filter-node-method="filterNode">
@@ -49,7 +49,6 @@
                     </span>
               </span>
             </el-tree>
-
           </el-card>
         </div>
       </div>
@@ -342,7 +341,6 @@
               <div v-else>
 
                   <div @click.stop style="display: inline-block">
-                    <el-dropdown trigger="click" @command="handleCommand">
                       <el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
                                  v-if="scope.row.collectBtn"
                                  @click="handleCommand([scope.row, '收藏'])"
@@ -353,31 +351,6 @@
                                  @click="handleCommand([scope.row, '取消收藏'])"
                       >
                       </el-button>
-<!--                      <i class="iconfont">&#xe61e;</i>-->
-<!--                      <el-dropdown-menu slot="dropdown">-->
-<!--                        <el-dropdown-item-->
-<!--                            v-if="scope.row.collectBtn"-->
-<!--                            :command="[scope.row, '收藏']"-->
-<!--                            v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"-->
-<!--                        >-->
-<!--                          收藏-->
-<!--                        </el-dropdown-item>-->
-<!--                        <el-dropdown-item-->
-<!--                            v-else-->
-<!--                            :command="[scope.row, '取消收藏']"-->
-<!--                            v-btn-permission="'47e155667f521467ed941c89d118e770'"-->
-<!--                        >-->
-<!--                          取消收藏-->
-<!--                        </el-dropdown-item>-->
-<!--                        <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">-->
-<!--                          编辑-->
-<!--                        </el-dropdown-item>-->
-<!--                        &lt;!&ndash;                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>&ndash;&gt;-->
-<!--                        <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'b299fa5edb3f3f35badb2adb6bda9f2e'">-->
-<!--                          删除-->
-<!--                        </el-dropdown-item>-->
-<!--                      </el-dropdown-menu>-->
-                    </el-dropdown>
                   </div>
 
               </div>
@@ -947,6 +920,7 @@
                     :disabled="formdisableflag"
                   ></custom-date-pick-group>
                 </template>
+                <!--                关联信息-代替标准号-->
                 <template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'CHJL'">
                   <template v-if="field.attrField === 'DTBJH' || field.attrField === 'YYBJ' || field.attrField === 'BYYBJ' || field.attrField === 'CBBH' || field.attrField === 'DXBZ'">
                     <custom-input-for-standards
@@ -2741,6 +2715,7 @@ export default {
         this.$nextTick(() => {
           Promise.all([this.queryDisplayLocation()]).then((values) => {
             const [displayLocation] = values
+            console.log('2717', displayLocation)
             const formFieldList = this.formFieldList
             this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
             this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
@@ -2795,6 +2770,7 @@ export default {
               })
             })
             this.dynamicFormField = displayLocation
+            console.log('2771',this.dynamicFormField)
             this.loading = false
           })
         })
@@ -3231,6 +3207,7 @@ export default {
             const formFieldList = this.formFieldList
             formFieldList.forEach((field) => {
               displayLocation.forEach((location) => {
+                console.log(location)
                 let value = dynamicFormField[field.attrField]
                 if (value && typeof value === 'number') {
                   value = this.$dateFormat(value, 'yyyy-MM-dd')
@@ -4636,23 +4613,23 @@ export default {
           rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}]
         }
         if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {
-          if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') {
+          // if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') {
-            rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'})
+          //   rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'})
-          } else {
+          // } else {
-            rule.push({
+          //   rule.push({
-              type: 'string',
+          //     type: 'string',
-              max: item.attrLen,
+          //     max: item.attrLen,
-              message: `${item.attrName}不能超过${item.attrLen}个字符`,
+          //     message: `${item.attrName}不能超过${item.attrLen}个字符`,
-              trigger: 'blur'
+          //     trigger: 'blur'
-            })
+          //   })
-          }
+          // }
         }
         if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH' || item.attrField === 'DXBZ') {
-          if (item.attrField === 'CBBH') {
+          // if (item.attrField === 'CBBH') {
-            rule.push({type: 'string', validator: this.verify.validateStandardItemNoRepeat, trigger: 'blur'})
+          //   rule.push({type: 'string', validator: this.verify.validateStandardItemNoRepeat, trigger: 'blur'})
-          } else {
+          // } else {
-            rule.push({type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'})
+          //   rule.push({type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'})
-          }
+          // }
         }
         if (rule.length > 0) {
           // this.$set(this.rules, item.attrField, rule)

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -162,7 +162,7 @@
               label="责任部门">
             </el-table-column>
             <el-table-column
-              prop="dutyEngineer"
+              prop="dutyEngineerName"
               width="100"
               label="责任工程师">
             </el-table-column>
@@ -415,6 +415,59 @@
               <el-col :span="24">
                 <el-form :model="addForm" inline class="label-input-form" :rules="formRules" label-width="180px"
                          ref="addForm">
+                  <el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+                    <el-input
+                      v-model="addForm.standSerialNumber"
+                      placeholder="请输入标准名称"
+                    />
+                    <el-button
+                      type="primary"
+                      class="common-button-primary"
+                      size="mini"
+                      style="position:absolute;top: 10px;right: 0;"
+                      @click="showStand"
+                    >手动查找</el-button>
+                  </el-form-item>
+                  <el-form-item prop="standName" label="标准名称" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+                    <el-input
+                      :disabled="true"
+                      v-model="addForm.standName"
+                      placeholder="请输入标准名称"
+                    />
+                  </el-form-item>
+                  <el-form-item prop="itemsNum" label="条款号" style="width: 100%; margin-right:10px"
+                                class="add-form-item add-input">
+                    <el-input
+                      v-model="addForm.itemsNum"
+                      placeholder="请输入条款号"
+                      :maxlength="500">
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item prop="itemsName" label="条款名称" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+                    <el-input
+                      v-model="addForm.itemsName"
+                      placeholder="请输入条款名称"
+                      :maxlength="500" />
+                  </el-form-item>
+                  <el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+                    <!--                    <el-input-->
+                    <!--                      :disabled="true"-->
+                    <!--                      v-model="addForm.productLine"-->
+                    <!--                      placeholder="请输入产品线"-->
+                    <!--                    />-->
+                    <el-select v-model="addForm.productLine" filterable  @change="handleChangeLine" placeholder="请选择产品线">
+                      <el-option
+                        v-for="item in productLines"
+                        :key="item.id"
+                        :label="item.productLine"
+                        :value="item"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
                   <el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-select v-model="addForm.productName" filterable  @change="handleChange" placeholder="请选择项目名称">
@@ -434,68 +487,13 @@
                       placeholder="请输入项目编号"
                     />
                   </el-form-item>
-                  <el-form-item prop="productType" label="产品类型" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      :disabled="true"
-                      v-model="addForm.productType"
-                      placeholder="请输入产品类型"
-                      />
-                  </el-form-item>
-                  <el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      :disabled="true"
-                      v-model="addForm.productLine"
-                      placeholder="请输入产品线"
-                      />
-                  </el-form-item>
-                  <el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-select
-                      v-model="addForm.standSerialNumber"
-                      filterable
-                      :disabled="serialNumber"
-                      @change="standChange"
-                      placeholder="请选择标准号">
-                      <el-option
-                        v-for="item in dataList"
-                        :key="item.standId"
-                        :label="item.standSort + '-' + item.standNumber + '-' + item.standYear"
-                        :value="item"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item prop="standName" label="标准名称" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      :disabled="true"
-                      v-model="addForm.standName"
-                      placeholder="请输入标准名称"
-                      />
-                  </el-form-item>
-                  <el-form-item prop="itemsNum" label="条款号" style="width: 100%; margin-right:10px"
-                                class="add-form-item add-input">
-                    <el-input
-                      v-model="addForm.itemsNum"
-                      placeholder="请输入条款号"
-                      :maxlength="500">
-                    </el-input>
-                  </el-form-item>
-                  <el-form-item prop="itemsName" label="条款名称" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      v-model="addForm.itemsName"
-                      placeholder="请输入条款名称"
-                      :maxlength="500" />
-                  </el-form-item>
                   <el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
                       v-model="addForm.responsibleUnit"
                       placeholder="请输入责任部门"
                       @click.native="choiceZRBM"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -510,7 +508,7 @@
                       v-model="addForm.dutyEngineer"
                       placeholder="请输入责任工程师"
                       @click.native="choiceZRR"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="authEngineer" label="认证工程师" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -518,7 +516,7 @@
                       v-model="addForm.authEngineer"
                       placeholder="请输入认证工程师"
                       @click.native="choiceMore('authEngineer','选择认证工程师',addForm.authEngineer)"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="qaEngineer" label="质量工程师" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -526,7 +524,7 @@
                       v-model="addForm.qaEngineer"
                       placeholder="请输入质量工程师"
                       @click.native="choiceMore('qaEngineer','选择质量工程师',addForm.qaEngineer)"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="planCloseTime" label="计划关闭时间" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -579,6 +577,136 @@
       :nodeList="nodeListZRBM"
       @checkedRole="drawerCheckZRBM"
     />
+    <el-dialog
+      title="添加标准"
+      :visible.sync="dialogTableVisible"
+       width="875px"
+      :close-on-click-modal="false"
+      :append-to-body="true"
+    >
+      <div class="search-area">
+        <div class="left">
+          <el-form :modal="standardSearch" :inline="true" class="label-input-form"
+                   style="margin-left:10px">
+            <el-form-item label="类型" class="search-item search-item-last">
+              <el-select
+                @change="typeChange"
+                v-model="standardSearch.standType"
+                placeholder="请选择"
+                filterable
+              >
+                <el-option
+                  v-for="item in standardTypeOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+              <el-input
+                v-model="standardSearch.standNumber"
+                placeholder="请输入标准号或标准名称"
+              ></el-input>
+            </el-form-item>
+            <el-form-item class="search-item btn-box">
+              <el-button
+                type="primary"
+                class="common-button-primary"
+                size="small"
+                v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                @click="getStandDataBtn">
+                查询
+              </el-button>
+            </el-form-item>
+            <el-form-item class="search-item btn-box">
+              <el-button
+                class="common-button-default"
+                size="small"
+                v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                @click="clearStandSearch">清空
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <el-table
+        :data="standardData"
+        tooltip-effect="dark"
+        style="width: 100%; overflow-y: auto;overflow-x: hidden;"
+        border
+        :height="300"
+        ref="table"
+        @selection-change="selectStand"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="code"
+          align="center"
+          label="标准号">
+          <template slot-scope="scope">
+            <a v-if="scope.row.standYear" class="table-jump"
+               @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                scope.row.standNumber
+              }}-{{ scope.row.standYear }}</a>
+            <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                scope.row.standSortShow
+              }}
+              {{ scope.row.standNumber }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="standName"
+          align="center"
+          min-width="200"
+          label="标准名称"
+        >
+          <template slot-scope="scope">
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="issueTime"
+          align="center"
+          label="发布日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="XCXSSRQ"
+          align="center"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="ZCCSSRQ"
+          align="center"
+          label="在产车实施日期">
+        </el-table-column>
+      </el-table>
+      <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
+      <!--分页-->
+      <pagination
+        style="position: relative;"
+        :page="page"
+        :pageSize="pageSize"
+        :total="total"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"
+      />
+      <div slot="footer"  class="demo-drawer-footer">
+        <el-button class="common-button-default" size="mini"  icon="el-icon-close" @click="cancelStand">取消</el-button>
+        <el-button type="primary"  size="mini" class="common-button-primary" icon="el-icon-check" @click="okStand">添加</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -593,11 +721,34 @@ export default {
       loading: false,
       nonList: [], //未符合项表格数据
       replaceLoading: false,
+      standList: [],
+      productLines: [], //产品线数据
       //项目数据
       ProjectDatas: [],
+      dialogTableVisible: false,
       itemsData: [],
       selectItems: [],
       dataList: [],
+      //查询添加标准相关数据
+      standardSearch: {
+        standType: "",
+        standNumber: "",
+        pageNo: 1,
+        pageSizeNo: this.$store.getters.userInfo.configContent
+      },
+      standardData: [], //存放标准数据
+      standardTypeOptions: [
+        {
+          value: "INLAND",
+          label: "国内标准法规",
+          item: "INLAND"
+        },
+        {
+          value: "FOREIGN",
+          label: "海外标准法规",
+          item: "FOREIGN"
+        }
+      ],
       page: 1,
       pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
@@ -685,9 +836,6 @@ export default {
       //数据查看
       historySee: false,
       historySeeForm: {},
-      // 新增编辑框的disabled
-      serialNumber: true,
-
       // 提交按钮loading
       submiting: false,
       // 选择人（单选）
@@ -749,6 +897,47 @@ export default {
         this.myLoading.loadData = false;
       });
     },
+    typeChange(type) {
+      console.log(type);
+      this.standardSearch.standType = type;
+    },
+    //取消添加
+    cancelStand(){
+      this.dialogTableVisible = false
+    },
+    //确认添加标准
+    okStand(){
+      if(this.standList > 1){
+        this.$message.warning('您只能选择一条标准进行添加')
+      }else if(this.standList < 1){
+        this.$message.warning('请至少选择一条数据进行添加')
+      }else{
+        this.addForm.standId = this.standList[0].id
+        this.addForm.standName = this.standList[0].standName
+        this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + '-' + this.standList[0].standYear
+        this.dialogTableVisible = false
+      }
+    },
+    //添加标准select的改变
+    selectStand(data) {
+      this.standList = data;
+    },
+    showStand(){
+      this.dialogTableVisible = true
+    },
+    //标准查询按钮
+    getStandDataBtn(){
+      this.page =1;
+      this.getStandDatas();
+    },
+    //清空查询按钮
+    clearStandSearch(){
+      this.standardSearch = {
+        standType: "",
+        standNumber: ""
+      };
+      this.getStandDatas();
+    },
     // 点击历史记录按钮事件
     historyClick() {
       this.$router.push({
@@ -873,25 +1062,24 @@ export default {
 
       }
     },
-    //获取项目数据
+    // //获取项目数据
-    getProjectData() {
+    // getProjectData() {
-      this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", {
+    //   this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", {
-        page: this.page,
+    //     page: 1,
-        pageSize: this.pageSize,
+    //     pageSize: 100,
-        ...this.projectSearch
+    //   }, {
-      }, {
+    //     _this: this
-        _this: this
+    //   }, res => {
-      }, res => {
+    //     if (res.data === null) {
-        if (res.data === null) {
+    //       this.ProjectDatas = "";
-          this.ProjectDatas = "";
+    //       this.total = 0;
-          this.total = 0;
+    //     } else {
-        } else {
+    //       this.ProjectDatas = res.data.Maintenance.records;
-          this.ProjectDatas = res.data.Maintenance.records;
+    //       this.total = res.data.Maintenance.total;
-          this.total = res.data.Maintenance.total;
+    //     }
-        }
+    //   });
-      });
+    //
-
+    // },
-    },
     //提交
     submit() {
       const id = this.addForm.id;
@@ -1004,13 +1192,31 @@ export default {
         });*/
       });
     },
+    //查询项目下的标准
+    getStandDatas() {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
+        standType: this.standardSearch.standType,
+        standNumber: this.standardSearch.standNumber,
+        page: this.pageNo,
+        pageSize: this.pageSizeNo
+      }, {
+        _this: this
+      }, res => {
+        this.standardData = res.data.list;
+        this.standardData.forEach(item => {
+          this.$set(item, "ZCCSSRQ", item.zccssrq);
+          this.$set(item, "XCXSSRQ", item.xcxssrq);
+        })
+        this.total = res.data.count;
+      }, e => {
+      });
+    },
     //新增事件
     addModel() {
       this.dataList = []
-      this.serialNumber = true
       this.drawerTitle = "新增";
-      this.getProjectData()
       this.drawerTable = true
+      this.getStandDatas()
     },
     //编辑事件
     projectEdit(row) {
@@ -1022,9 +1228,8 @@ export default {
         }
       })
       let productId = this.projectId
-      this.getProjectData()
+      // this.getProjectData()
       this.getStandData(productId)
-      this.serialNumber = false
       this.drawerTable = true;
     },
     //点击查看按钮事件
@@ -1091,6 +1296,15 @@ export default {
       });
     },
     // 分页事件
+    pageChange(page) {
+      this.page = page;
+      this.getStandDatas()
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getStandDatas()
+    },
+    // 分页事件
     pageChangeNo(page) {
       this.pageNo = page;
       this.getTableByPage();
@@ -1099,6 +1313,11 @@ export default {
       this.pageSizeNo = pageSize;
       this.getTableByPage();
     },
+    //产品线change事件
+    handleChangeLine(val){
+      this.addForm.productLine = val.productLine
+      this.ProjectDatas = val.sarStandProjectLibraries
+    },
 
     /** 项目名称change事件 */
     handleChange(val) {
@@ -1108,18 +1327,11 @@ export default {
       }
       this.addForm.productId = val.id
       this.addForm.productId = val.projectNumber
-      this.addForm.productLine = val.productLine
       this.addForm.productName = val.projectName
       this.addForm.productType = val.projectPlatfor
       this.serialNumber = false
-      let productId = val.id
+      // let productId = val.id
-      this.getStandData(productId)
+      // this.getStandData(productId)
-    },
-    /** 标准号change事件 */
-    standChange(item) {
-      this.addForm.standId = item.standId
-      this.addForm.standName = item.standName
-      this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
     },
     /** 责任工程师选择 */
     choiceZRR(type, title, id) {
@@ -1179,11 +1391,28 @@ export default {
       this.addForm.responsibleUnit = nameList;
 
     },
+    //获取产品线数据
+    getProductData() {
+      this.$http.get("sarStandProjectLibrary/queryProjectManager", {
+        current: 1,
+        PageSize:100,
+      }, {
+        _this: this
+      }, res => {
+        res.data.records.forEach(item => {
+          if(item.productLine){
+            this.productLines.push(item)
+          }
+        })
+      }, e => {
+
+      });
+    },
 
   },
   mounted() {
-    //查询已维护的项目
+    //查询产品线
-    this.getProjectData();
+    this.getProductData()
     this.getData()
     // 加载所有的部门
     this.getOrgTreeSource();
@@ -1192,6 +1421,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/.el-dialog__body{
+  padding: 15px 20px;
+}
 .el-select-dropdown__item.selected {
   color: #606266 !important;
 }
@@ -1270,6 +1502,5 @@ export default {
       }
     }
   }
-
 }
 </style>

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -78,7 +78,7 @@
           label="章节编号"
           sortable
           align="center"
-          width="180">
+          width="120">
         </el-table-column>
         <el-table-column
           prop="content"
@@ -108,11 +108,13 @@
           prop="deptName"
           align="center"
           label="提出部门"
+          width="170"
         >
         </el-table-column>
         <el-table-column
           prop="userName"
           align="center"
+          width="10 0"
           label="提出人"
         >
         </el-table-column>