commit

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

@@ -46,12 +46,22 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                    <div class="fileClass" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       {{ item.fileName }}
                       <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
                     </div>
                   </div>
                 </el-form-item>
+                <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
+                  <div v-if="form.modelList.length > 0" style="display: flex; margin-left: 10px">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updataFj(item)">
+                      {{ item.name }}
+                    </div>
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -108,6 +118,9 @@
               prop="oldText"
               align="center"
               label="修改前">
+              <template slot-scope="scope">
+                <el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
+              </template>
             </el-table-column>
             <el-table-column
               prop="newText"
@@ -233,6 +246,15 @@
               :is-visible.sync="drawerModal"
               @checkedRole="checkedRole"
       ></Role-tree>
+    <el-dialog
+            title="查看修改前内容"
+            :visible.sync="itermsConditionsFlag"
+            size="800px">
+      <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+      <div slot="footer">
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -247,7 +269,9 @@ export default {
   name: "bzzqyjStep7",
   data() {
     return {
-        drawerModal: false,
+      itermsConditionsFlag: false,
+      itermsConditionsTitle: '',
+      drawerModal: false,
       histortData: [],
       oldData: [],
       data: [],
@@ -275,6 +299,9 @@ export default {
         cname: '', // 名称
         fjList: [],
         fjListId: '',
+        textType: '',
+        modelList: [],
+        modelNameList: '',
       },
       formRules: {
         responUserList: [
@@ -290,6 +317,13 @@ export default {
     ProcessTitle
   },
   methods: {
+    itermsConditionsClose () {
+      this.itermsConditionsFlag = false
+    },
+    itermsConditionsOpen (row) {
+      this.itermsConditionsFlag = true
+      this.itermsConditionsTitle = row
+    },
     downloadFile (attId) {
       window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
     },
@@ -449,6 +483,9 @@ export default {
               arr.push(item)
             }
           })
+          this.form.textType = data.textType
+          this.form.modelList = data.modelList
+          this.form.modelNameList = data.modelNameList
           this.json = data
           this.data = arr
         }).catch(e => {

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

@@ -46,12 +46,22 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                    <div class="fileClass" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       {{ item.fileName }}
                       <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
                     </div>
                   </div>
                 </el-form-item>
+                <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
+                  <div v-if="form.modelList.length > 0" style="display: flex;margin-left: 10px;">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updataFj(item)">
+                      {{ item.name }}
+                    </div>
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -108,6 +118,9 @@
               prop="oldText"
               align="center"
               label="修改前">
+              <template slot-scope="scope">
+                <el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
+              </template>
             </el-table-column>
             <el-table-column
               prop="newText"
@@ -233,6 +246,15 @@
               :is-visible.sync="drawerModal"
               @checkedRole="checkedRole"
       ></Role-tree>
+    <el-dialog
+            title="查看修改前内容"
+            :visible.sync="itermsConditionsFlag"
+            size="800px">
+      <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+      <div slot="footer">
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -247,7 +269,9 @@ export default {
   name: "bzzqyjStep8",
   data() {
     return {
-        drawerModal: false,
+      itermsConditionsFlag: false,
+      itermsConditionsTitle: '',
+      drawerModal: false,
       histortData: [],
       oldData: [],
       data: [],
@@ -275,6 +299,9 @@ export default {
         cname: '', // 名称
         fjList: [],
         fjListId: '',
+        textType: '',
+        modelList: [],
+        modelNameList: '',
       },
       formRules: {
         responUserList: [
@@ -290,6 +317,13 @@ export default {
     ProcessTitle
   },
   methods: {
+    itermsConditionsClose () {
+      this.itermsConditionsFlag = false
+    },
+    itermsConditionsOpen (row) {
+      this.itermsConditionsFlag = true
+      this.itermsConditionsTitle = row
+    },
     downloadFile (attId) {
       window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
     },
@@ -450,6 +484,9 @@ export default {
             }
           })
           this.json = data
+          this.form.textType = data.textType
+          this.form.modelList = data.modelList
+          this.form.modelNameList = data.modelNameList
           this.data = arr
           this.oldData = data.oldinfo
         }).catch(e => {

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

@@ -46,12 +46,22 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                    <div class="fileClass" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       {{ item.fileName }}
                       <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
                     </div>
                   </div>
                 </el-form-item>
+                <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
+                  <div v-if="form.modelList.length > 0" style="display: flex;margin-left: 10px;">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updataFj(item)">
+                      {{ item.name }}
+                    </div>
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -108,6 +118,9 @@
               prop="oldText"
               align="center"
               label="修改前">
+              <template slot-scope="scope">
+                <el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
+              </template>
             </el-table-column>
             <el-table-column
               prop="newText"
@@ -233,6 +246,15 @@
             :is-visible.sync="drawerModal"
             @checkedRole="checkedRole"
     ></Role-tree>
+    <el-dialog
+            title="查看修改前内容"
+            :visible.sync="itermsConditionsFlag"
+            size="800px">
+      <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+      <div slot="footer">
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -247,6 +269,8 @@ export default {
   name: "bzzqyjStep9",
   data() {
     return {
+      itermsConditionsFlag: false,
+      itermsConditionsTitle: '',
       drawerModal: false,
       histortData: [],
       oldData: [],
@@ -275,6 +299,9 @@ export default {
         cname: "", // 名称
         fjList: [],
         fjListId: '',
+        textType: '',
+        modelList: [],
+        modelNameList: '',
       },
       formRules: {
         responUserList: [
@@ -290,6 +317,13 @@ export default {
     ProcessTitle
   },
   methods: {
+    itermsConditionsClose () {
+      this.itermsConditionsFlag = false
+    },
+    itermsConditionsOpen (row) {
+      this.itermsConditionsFlag = true
+      this.itermsConditionsTitle = row
+    },
     downloadFile (attId) {
       window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
     },
@@ -450,6 +484,9 @@ export default {
             }
           })
           this.json = data
+          this.form.textType = data.textType
+          this.form.modelList = data.modelList
+          this.form.modelNameList = data.modelNameList
           this.data = arr
           this.oldData = data.oldinfo
         }).catch(e => {

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

@@ -680,7 +680,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else {
+          } else if (row.taskInfo === '工程研究总院院长批准') {
             this.$router.push({
               name: 'bzzqyjStep9',
               query: {