Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!315

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

@@ -139,13 +139,13 @@
                                 </el-form-item>
                             </el-card>
                         </el-timeline-item>
-                        <el-timeline-item timestamp="选择部门责任人" placement="top" :color="roleForm.dockUserName ? '#66b1ff' : ''">
+                        <el-timeline-item timestamp="任务分发" placement="top" :color="roleForm.dockUserName ? '#66b1ff' : ''">
                             <el-card>
                                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
-                                    <h4>责任部门对接人</h4>
+                                    <h4>技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员</h4>
                                     <div style="margin-top: 10px;width: 300px;">
                                         <el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择责任部门对接人" readonly="readonly" @click.native="choiceZRRS('1')">
+                                        <el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员" readonly="readonly" @click.native="choiceZRRS('1')">
                                         </el-input>
                                     </div>
                                 </el-form-item>
@@ -154,10 +154,10 @@
                         <el-timeline-item timestamp="审批" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
                             <el-card>
                                 <el-form-item prop="ministerUserName" style="margin-bottom: 0">
-                                    <h4>标准法规部部长</h4>
+                                    <h4>标准法规部高级经理、责任部门高级经理</h4>
                                     <div style="margin-top: 10px;width: 300px;">
                                         <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部部长" readonly="readonly"  @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
+                                        <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部高级经理、责任部门高级经理" readonly="readonly"  @click.native="choiceZRR('ministerUser', '选择标准法规部高级经理、责任部门高级经理', roleForm.ministerUser)"></el-input>
                                     </div>
                                 </el-form-item>
                             </el-card>
@@ -413,7 +413,7 @@
                 this.type2 = type
                 this.nodeList2 = []
                 if (type === '1') {
-                    this.drawerTitle2 = '选择责任部门对接人'
+                    this.drawerTitle2 = '选择技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员'
                     if ( this.roleForm.dockUserList.length > 0) {
                         this.nodeList2 = this.roleForm.dockUserList.split(',')
                     }

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

@@ -139,13 +139,13 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择部门责任人" placement="top" :color="roleForm.dockUserName ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="任务分发" placement="top" :color="roleForm.dockUserName ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
-                  <h4>责任部门对接人</h4>
+                  <h4>技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择责任部门对接人" readonly="readonly" @click.native="choiceZRRS('1')">
+                    <el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员" readonly="readonly" @click.native="choiceZRRS('1')">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -154,10 +154,10 @@
             <el-timeline-item timestamp="审批" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="ministerUserName" style="margin-bottom: 0">
-                  <h4>标准法规部部长</h4>
+                  <h4>标准法规部高级经理、责任部门高级经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部部长" readonly="readonly"  @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
+                    <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部高级经理、责任部门高级经理" readonly="readonly"  @click.native="choiceZRR('ministerUser', '选择标准法规部高级经理、责任部门高级经理', roleForm.ministerUser)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -403,7 +403,7 @@ export default {
       this.type2 = type
       this.nodeList2 = []
       if (type === '1') {
-        this.drawerTitle2 = '选择责任部门对接人'
+        this.drawerTitle2 = '选择技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员'
         if ( this.roleForm.dockUserList.length > 0) {
           this.nodeList2 = this.roleForm.dockUserList.split(',')
         }

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

@@ -11,6 +11,118 @@
     </div>
     <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto;">
+        <el-form
+                ref="bzzqyjForm"
+                :model="form"
+                :rules="formRules"
+                class="label-input-form"
+                label-width="210px"
+        >
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+          <div class="prc-content-border">
+            <el-row :gutter="24">
+              <el-col :span="24">
+                <el-form-item label="标准号/名称" prop="cid" class="add-form-item form-item-disabled">
+                  <div class="addButton" style="padding-left: 10px">
+                    <el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button>
+                  </div>
+                  <el-input
+                          disabled
+                          v-model="form.cid"
+                          placeholder="请输入标准编号"
+                          clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
+                  <el-date-picker
+                          v-model="form.endTime"
+                          type="date"
+                          :picker-options="pickerOptions"
+                          placeholder="请选择结束日期">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
+                  <el-select :disabled="!form.cid" v-model="form.textType" placeholder="请选择">
+                    <el-option
+                            v-for="(item, index) in textTypeList"
+                            :key="index"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
+                  <div class="addButton" style="padding-left: 10px">
+                    <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
+                  </div>
+                  <el-input
+                          v-model="form.fjListId"
+                          style="display: none;"
+                  ></el-input>
+                  <div style="">
+                    <div class="fileClass" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      <span @click="fileLook(item)" >{{ item.fileName }}</span>
+                      <el-button
+                              size="small"
+                              @click="filesUpload(item)"
+                              icon="el-icon-download"
+                              style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
+                </el-form-item>
+                <el-form-item label="上传附件" prop="modelNameList" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.modelNameList"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.modelList.length > 0" class="fileClass" style="">
+                    <div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px; padding-left: 10px;">
+                      <span @click="fileLook(item)">{{ item.name }}</span>
+                      <el-button
+                              size="small"
+                              @click="filesUpload(item)"
+                              icon="el-icon-download"
+                              style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
+                  <div class="addButton" style="padding-left: 10px">
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            @click="fileUpload"
+                            size="small">
+                      点击上传
+                    </el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+      </div>
+      <el-collapse accordion v-model="activeNames">
+        <el-collapse-item title="回执说明" name="1">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText1">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+    <div class="content" v-show="active === '2'">
+      <div class="block" style="padding-top: 20px;">
+        <el-timeline>
           <el-form
                   ref="Form"
                   :model="roleForm"
@@ -88,101 +200,6 @@
               </el-card>
             </el-timeline-item>
           </el-form>
-      </div>
-      <el-collapse accordion v-model="activeNames">
-        <el-collapse-item title="回执说明" name="1">
-          <div style="margin: 10px 0;">
-            <el-input
-              type="textarea"
-              :rows="3"
-              resize="none"
-              placeholder="请输入意见"
-              v-model="commentText1">
-            </el-input>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
-    </div>
-    <div class="content" v-show="active === '2'">
-      <div class="block" style="padding-top: 20px;">
-        <el-timeline>
-          <el-form
-            ref="Form"
-            :model="roleForm"
-            :rules="roleFormRules"
-            class="label-input-form myForm">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="startUserName" style="margin-bottom: 0">
-                  <h4>流程发起人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.startUser" style="display: none;"/>
-                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled/>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="dockUserList" style="margin-bottom: 0">
-                  <h4>责任部门对接人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.dockUserList" style="display: none;"/>
-                    <el-input
-                      v-model="roleForm.dockUserListName"
-                      placeholder="选择责任部门对接人"
-                      @click.native="choiceZRRS('1')">
-                    </el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="审核征求意见" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="ministerUser" style="margin-bottom: 0">
-                  <h4>标准法规部部长</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.ministerUser" style="display: none;"/>
-                    <el-input
-                      v-model="roleForm.ministerUserName"
-                      placeholder="选择标准法规部部长·"
-                      @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"
-                    />
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="directorUser" style="margin-bottom: 0">
-                  <h4>技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.directorUser" style="display: none;"/>
-                    <el-input
-                      v-model="roleForm.directorUserName"
-                      placeholder="选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任"
-                      @click.native="choiceZRRS('2')"
-                    />
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="presidentUser" style="margin-bottom: 0">
-                  <h4>工程研究总院院长或标准法规主管副院长</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.presidentUser" style="display: none;"/>
-                    <el-input
-                      v-model="roleForm.presidentUserName"
-                      placeholder="选择工程研究总院院长或标准法规主管副院长"
-                      @click.native="choiceZRR('presidentUser', '选择工程研究总院院长或标准法规主管副院长', roleForm.presidentUser)"
-                    />
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-          </el-form>
         </el-timeline>
       </div>
     </div>

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -283,7 +283,7 @@ export default {
       const prcType = row.prcType
       switch(prcType) {
         case '1':
-          if (row.taskInfo === '标准法规业务经理审批') {
+          if (row.taskInfo === '批准') {
             this.$router.push({
               name: 'bzrkStep2',
               query: {
@@ -294,7 +294,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '责任人会签'){
+          }else if (row.taskInfo === '会签'){
             this.$router.push({
               name: 'bzrkStep3',
               query: {
@@ -305,7 +305,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '申请人修订'){
+          }else if (row.taskInfo === '修订'){
             this.$router.push({
               name: 'bzrkStep4',
               query: {
@@ -1175,7 +1175,7 @@ export default {
             break
         //未符合项整改流程
         case '8' :
-          if(row.taskInfo === '下发至标准法规工程师'){
+          if(row.taskInfo === '审核'){
             this.$router.push({
               name: 'wfhxzgStep2',
               query: {
@@ -1187,7 +1187,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '确认+选择责任人') {
+          } else if (row.taskInfo === '合规排查(上传合规举证材料)') {
             this.$router.push({
               name: 'wfhxzgStep3',
               query: {
@@ -1199,7 +1199,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '上传佐证材料填写信息') {
+          }else if (row.taskInfo === '审定') {
             this.$router.push({
               name: 'wfhxzgStep4',
               query: {