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

src/api/unqualProcess.js

@@ -65,7 +65,7 @@ export function meetingByMonth(params) {
 export function addUn(
   closeState,standId, standSerialNumber, standName,
   itemsNum, itemsName, productType,
-  productLine, productName,productId,reason, responsibleUnit,
+  productLine, productName,productId,reason,
   dutyEngineer, authEngineer, qaEngineer, planCloseTime) {
   const data = {
     closeState,
@@ -79,7 +79,6 @@ export function addUn(
     productName, //项目名称
     productId, //项目编号
     reason, //不合规项目
-    responsibleUnit, //责任部门
     dutyEngineer, //责任工程师
     authEngineer, //认证工程师
     qaEngineer, //质量工程师
@@ -96,7 +95,7 @@ export function addUn(
 export function editUn(
   closeState, standId, standSerialNumber, standName,
   itemsNum, itemsName, productType,
-  productLine, productName, reason, responsibleUnit,
+  productLine, productName, reason,
   dutyEngineer, authEngineer, qaEngineer, planCloseTime, id) {
   const data = {
     closeState,
@@ -109,7 +108,6 @@ export function editUn(
     productLine, //产品线
     productName, //项目名称
     reason, //不合规项目
-    responsibleUnit, //责任部门
     dutyEngineer, //责任工程师
     authEngineer, //认证工程师
     qaEngineer, //质量工程师

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

@@ -646,6 +646,7 @@
                 v-show="verifySarStandard"
                 show-save
                 show-submit
+                :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
                 @save="handleSave"
                 @submit="handleSubmit"

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

@@ -1003,6 +1003,7 @@
                 },
                 loading: false,
                 drawerModal: false,
+                taskInfo:'标准法规部部长审核',
                 assigneeNewLoading: false,
                 disabledState: true,
                 userId:this.$store.getters.userInfo.userId,

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="请输入更名原因"

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/xmpg/step1-7.vue

@@ -206,10 +206,6 @@
             align="center"
             label="在产车实施日期">
           </el-table-column>
-          <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
             <el-table-column
               prop="complianceReasons"
               align="center"
@@ -243,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,46 +158,55 @@
           <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"
             align="center"
+            width="120px"
             label="新车型实施日期">
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             align="center"
+            width="120px"
             label="在产车实施日期">
           </el-table-column>
           <el-table-column
@@ -211,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="选择落实人"
@@ -330,6 +346,7 @@ export default {
     return {
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
+      currentPage: 1,
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
@@ -360,6 +377,7 @@ export default {
       tabValue: "listOfCountries",
       selectedList: [],  //选择清单的选择框
       selectList: [], //选择标准的选择框
+      selectStandList: [], //点开批量弹窗选择数据丢失
       lsIndex: "",
       lsType: "",
       bringData: [],
@@ -498,6 +516,10 @@ export default {
       });
       window.open(routeUrl.href, "_blank");
     },
+    // 分页
+    handleCurrentChange(currentPage) {
+      this.currentPage = currentPage;
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -555,6 +577,7 @@ export default {
               xcxssrq: item.pepdtos[i].XCXSSRQ,
               zccssrq: item.pepdtos[i].ZCCSSRQ
             });
+            this.total = this.listForm.breakdownList.length
           }
         }
       } else {
@@ -579,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;
@@ -594,6 +617,7 @@ export default {
       this.modalshowflag = false;
     },
     choiceZRRS(row, type, index) {
+     this.selectStandList = this.selectList
       this.type = type;
       if (type === 1) {
         this.drawerTitle = "选择责任人";
@@ -653,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;
@@ -684,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());
@@ -699,6 +719,7 @@ export default {
     },
     //标准表格选择框改变
     selectStandChange(data) {
+      console.log(data);
       this.selectList = data;
     },
     selectThree() {

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

@@ -598,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.vue

@@ -615,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/step6.vue

@@ -121,10 +121,6 @@
             align="center"
             label="在产车实施日期">
           </el-table-column>
-          <!--          <el-table-column-->
-          <!--            prop="productType"-->
-          <!--            align="center"-->
-          <!--            label="在研产品">-->
           <el-table-column
             prop="researchCompliance"
             align="center"
@@ -224,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"

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

@@ -250,7 +250,7 @@
                   <div class="seeItem">{{ historySeeForm.responsibleUnit }}</div>
                 </el-form-item>
                 <el-form-item class="add-form-item" label="责任工程师:">
-                  <div class="seeItem">{{ historySeeForm.dutyEngineer }}</div>
+                  <div class="seeItem">{{ historySeeForm.dutyEngineerName }}</div>
                 </el-form-item>
                 <el-form-item class="add-form-item" label="认证工程师:">
                   <div class="seeItem">{{ historySeeForm.authEngineer }}</div>
@@ -418,8 +418,9 @@
                   <el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
+                      readonly
                       v-model="addForm.standSerialNumber"
-                      placeholder="请输入标准名称"
+                      placeholder="请输入标准号"
                     />
                     <el-button
                       type="primary"
@@ -432,7 +433,7 @@
                   <el-form-item prop="standName" label="标准名称" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
-                      :disabled="true"
+                      readonly
                       v-model="addForm.standName"
                       placeholder="请输入标准名称"
                     />
@@ -487,14 +488,14 @@
                       placeholder="请输入项目编号"
                     />
                   </el-form-item>
-                  <el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"
+<!--                  <el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"-->
-                                class="add-form-item">
+<!--                                class="add-form-item">-->
-                    <el-input
+<!--                    <el-input-->
-                      v-model="addForm.responsibleUnit"
+<!--                      v-model="addForm.responsibleUnit"-->
-                      placeholder="请输入责任部门"
+<!--                      placeholder="请输入责任部门"-->
-                      @click.native="choiceZRBM"
+<!--                      @click.native="choiceZRBM"-->
-                    />
+<!--                    />-->
-                  </el-form-item>
+<!--                  </el-form-item>-->
                   <el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
@@ -502,10 +503,10 @@
                       placeholder="请输入不合规项目"
                       :maxlength="500" />
                   </el-form-item>
-                  <el-form-item prop="dutyEngineer" label="责任工程师" style="width: 100%; margin-right:10px"
+                  <el-form-item prop="dutyEngineerName" label="责任工程师" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
-                      v-model="addForm.dutyEngineer"
+                      v-model="addForm.dutyEngineerName"
                       placeholder="请输入责任工程师"
                       @click.native="choiceZRR"
                     />
@@ -775,22 +776,22 @@ export default {
       }, //表单数据
       formRules: {
         standSerialNumber: [
-          { required: true, message: "请输入标准号", trigger: "blur" }
+          { required: true, message: "请输入标准号", trigger: "change" }
         ],
         standName: [
-          { required: true, message: "请输入标准名称", trigger: "blur" }
+          { required: true, message: "请输入标准名称", trigger: "change" }
+        ],
+        itemsNum: [
+          { required: true, message: "请输入条款号", trigger: "change" }
+        ],
+        itemsName: [
+          { required: true, message: "请输入条款名称", trigger: "change" }
         ],
-        // itemsNum: [
-        //   { required: true, message: "请输入条款号", trigger: "blur" }
-        // ],
-        // itemsName: [
-        //   { required: true, message: "请输入条款名称", trigger: "blur" }
-        // ],
         productType: [
-          { required: true, message: "请输入产品类型", trigger: "blur" }
+          { required: true, message: "请输入产品类型", trigger: "change" }
         ],
         productLine: [
-          { required: true, message: "请输入产品线", trigger: "blur" }
+          { required: true, message: "请输入产品线", trigger: "change" }
         ],
         productName: [
           { required: true, message: "请输入项目名称", trigger: "change" }
@@ -799,16 +800,16 @@ export default {
           { required: true, message: "请输入项目编号", trigger: "change" }
         ],
         reason: [
-          { required: true, message: "请输入不合规项目", trigger: "blur" }
+          { required: true, message: "请输入不合规项目", trigger: "change" }
-        ],
-        responsibleUnit: [
-          { required: true, message: "请输入责任部门", trigger: "blur" }
         ],
+        // responsibleUnit: [
+        //   { required: true, message: "请输入责任部门", trigger: "change" }
+        // ],
         dutyEngineerName: [
-          { required: true, message: "请输入责任工程师", trigger: "blur" }
+          { required: true, message: "请输入责任工程师", trigger: "change" }
         ],
         planCloseTime: [
-          { required: true, message: "请选择计划关闭时间", trigger: "blur" }
+          { required: true, message: "请选择计划关闭时间", trigger: "change" }
         ]
       },
       drawerTable: false, //表单模态窗
@@ -907,15 +908,18 @@ export default {
     },
     //确认添加标准
     okStand(){
-      if(this.standList > 1){
+      if(this.standList.length > 1){
         this.$message.warning('您只能选择一条标准进行添加')
-      }else if(this.standList < 1){
+      }else if(this.standList.length < 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
+        if(this.addForm.standName){
+          this.$refs.addForm.validateField('standName');
+        }
       }
     },
     //添加标准select的改变
@@ -1094,7 +1098,7 @@ export default {
       const productName = this.addForm.productName;
       const productId = this.addForm.productId;
       const reason = this.addForm.reason;
-      const responsibleUnit = this.addForm.responsibleUnit;
+      // const responsibleUnit = this.addForm.responsibleUnit;
       const dutyEngineer = this.addForm.dutyEngineer;
       const authEngineer = this.addForm.authEngineer;
       const qaEngineer = this.addForm.qaEngineer;
@@ -1107,7 +1111,7 @@ export default {
               closeState, standId, standSerialNumber,
               standName, itemsNum, itemsName, productType,
               productLine, productName, productId,reason,
-              responsibleUnit, dutyEngineer,
+              dutyEngineer,
               authEngineer, qaEngineer, planCloseTime).then(res => {
               if (res.ok) {
                 this.submiting = false
@@ -1128,7 +1132,7 @@ export default {
             editUn(
               closeState, standId, standSerialNumber,
               standName, itemsNum, itemsName, productType,
-              productLine, productName, reason, responsibleUnit,
+              productLine, productName, reason,
               dutyEngineer, authEngineer, qaEngineer,
               planCloseTime, id).then(res => {
               if (res.ok) {
@@ -1197,8 +1201,8 @@ export default {
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
         standType: this.standardSearch.standType,
         standNumber: this.standardSearch.standNumber,
-        page: this.pageNo,
+        page: this.page,
-        pageSize: this.pageSizeNo
+        pageSize: this.pageSize
       }, {
         _this: this
       }, res => {
@@ -1258,13 +1262,24 @@ export default {
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.standId,
+          id: item.id,
-          pageType: "FOREIGN_STAND"
+          pageType: "INLAND_STAND"
-          // pageType: item.standType + '_STAND'
         }
       });
       window.open(routeUrl.href, "_blank");
     },
+    // 点击查看
+    // handlePreview(item) {
+    //   let routeUrl = this.$router.resolve({
+    //     name: "OtherStandardDetails",
+    //     params: {
+    //       id: item.standId,
+    //       pageType: "FOREIGN_STAND"
+    //       // pageType: item.standType + '_STAND'
+    //     }
+    //   });
+    //   window.open(routeUrl.href, "_blank");
+    // },
     detailsStandard(item) {
       this.$http.post("lawss/sarTestItem/validateStandNumber", {
         standNumber: item.standNum
@@ -1341,7 +1356,13 @@ export default {
       this.roleShowflag = true
     },
     drawerCheck(data) {
-      this.addForm.dutyEngineer = data[0].name
+      // this.addForm.dutyEngineer = data[0].id
+      // this.addForm.dutyEngineerName = data[0].name
+      this.$set(this.addForm, 'dutyEngineer', data[0].id)
+      this.$set(this.addForm, 'dutyEngineerName', data[0].name)
+      if(this.addForm.dutyEngineerName){
+        this.$refs.addForm.validateField('dutyEngineerName');
+      }
       this.roleShowflag = false
     },
     /** 选择认证工程师和质量工程师 */