commit

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

@@ -164,12 +164,18 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column
+                  prop="cause"
+                  align="center"
+                  label="原因">
+          </el-table-column>
           <el-table-column
                   label="操作"
                   width="100"
                   align="center">
             <template slot-scope="scope">
-              <el-button :disabled="scope.row.state !== '2'"
+              <!--                      :disabled="scope.row.state !== '2'"-->
+              <el-button
                          class="common-button-primary"
                          size="mini"
                          type="primary"
@@ -315,6 +321,13 @@
                     maxlength="500"
             ></el-input>
           </el-form-item>
+          <el-form-item label="原因" prop="cause" class="add-form-item" >
+            <el-input
+                    v-model="editForm.cause"
+                    placeholder="请输入原因"
+                    maxlength="500"
+            ></el-input>
+          </el-form-item>
         </el-form>
       </div>
       <div id="roleFormButton3" class="demo-drawer-footer">
@@ -346,6 +359,10 @@
           oldText: '',
           newText: '',
           reason: '',
+          cause: '',
+          department: '',
+          responUserName: '',
+          state: '',
         },
         itermsConditionsFlag: false,
         itermsConditionsTitle: '',
@@ -436,6 +453,8 @@
             this.data[a].oldText = this.editForm.oldText
             this.data[a].newText = this.editForm.newText
             this.data[a].reason = this.editForm.reason
+            this.data[a].cause = this.editForm.cause
+            this.$set(this.data, a,this.editForm)
           }
         }
         this.modalshowflag2 = false
@@ -452,6 +471,10 @@
           oldText: row.oldText,
           newText: row.newText,
           reason: row.reason,
+          cause: row.cause,
+          department: row.department,
+          responUserName: row.responUserName,
+          state: row.state
         }
       },
       itermsConditionsClose () {
@@ -536,7 +559,17 @@
         });
       },
       handleSubmit() {
-          this.isSubmit = true;
+        let a = 0
+        for (let b = 0; b < this.data.length;b++) {
+          if (this.data[b].state === '3' && !this.data[b].cause) {
+            a++
+          }
+        }
+        if (a > 0) {
+          this.$message.warning('请输入不上报原因')
+          return;
+        }
+        this.isSubmit = true;
           var json = this.json;
           json.oldinfo = this.oldData;
           json.commentText = this.commentText5;
@@ -567,6 +600,9 @@
             this.form.cid = data.form ? data.form.cid : data.cid
             this.form.endTime = data.form ? data.form.endTime : data.endTime
             data.info.forEach(item => {
+              if (!item.source) {
+                item.source = '1'
+              }
               if (item.state) {
               } else {
                 item.state = "1";
@@ -584,6 +620,7 @@
                   item.chapterNumber = item.partCode;
                   item.responUserName = item.userName;
                   item.state = '1'
+                  item.source = '2'
                   this.data.push(item);
                 });
               });

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

@@ -173,6 +173,11 @@
               <div>{{ stateText(scope.row.state) }}</div>
             </template>
           </el-table-column>
+          <el-table-column
+                  prop="cause"
+                  align="center"
+                  label="原因">
+          </el-table-column>
         </el-table>
       </div>
       <el-collapse accordion>
@@ -444,12 +449,11 @@
               reason: "修改理由",
               department: "提出部门",
               responUserName: "提出人",
+              stateText: "处理意见",
+              cause: "原因",
             },
             dataList: []
           };
-          if (title === '上报意见.xls') {
-            params.columnName.stateText = "处理意见"
-          }
           params.dataList = JSON.parse(JSON.stringify(row));
           params.dataList.forEach(item => {
             if (item.state === "1") {

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

@@ -165,6 +165,11 @@
               <div>{{ stateText(scope.row.state) }}</div>
             </template>
           </el-table-column>
+          <el-table-column
+                  prop="cause"
+                  align="center"
+                  label="原因">
+          </el-table-column>
         </el-table>
       </div>
       <el-collapse accordion>
@@ -406,12 +411,11 @@ export default {
             reason: "修改理由",
             department: "提出部门",
             responUserName: "提出人",
+            stateText: "处理意见",
+            cause: "原因",
           },
           dataList: []
         };
-        if (title === '上报意见.xls') {
-          params.columnName.stateText = "处理意见"
-        }
         params.dataList = JSON.parse(JSON.stringify(row));
         params.dataList.forEach(item => {
           if (item.state === "1") {
@@ -439,6 +443,8 @@ export default {
       this.active = name
     },
     handleSubmit() {
+      console.log(this.data);
+      return
         this.isSubmit = true
         var json = this.json
         json.bdFlag = '0'

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

@@ -165,6 +165,11 @@
               <div>{{ stateText(scope.row.state) }}</div>
             </template>
           </el-table-column>
+          <el-table-column
+                  prop="cause"
+                  align="center"
+                  label="原因">
+          </el-table-column>
         </el-table>
       </div>
       <el-collapse accordion>
@@ -410,12 +415,11 @@ export default {
             reason: "修改理由",
             department: "提出部门",
             responUserName: "提出人",
+            stateText: "处理意见",
+            cause: "原因",
           },
           dataList: []
         };
-        if (title === '上报意见.xls') {
-          params.columnName.stateText = "处理意见"
-        }
         params.dataList = JSON.parse(JSON.stringify(row));
         params.dataList.forEach(item => {
           if (item.state === "1") {

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

@@ -165,6 +165,11 @@
               <div>{{ stateText(scope.row.state) }}</div>
             </template>
           </el-table-column>
+          <el-table-column
+                  prop="cause"
+                  align="center"
+                  label="原因">
+          </el-table-column>
         </el-table>
       </div>
       <el-collapse accordion>
@@ -409,12 +414,11 @@ export default {
             reason: "修改理由",
             department: "提出部门",
             responUserName: "提出人",
+            stateText: "处理意见",
+            cause: "原因",
           },
           dataList: []
         };
-        if (title === '上报意见.xls') {
-          params.columnName.stateText = "处理意见"
-        }
         params.dataList = JSON.parse(JSON.stringify(row));
         params.dataList.forEach(item => {
           if (item.state === "1") {

src/pages/processCenter/pages/phone/bzzqyj/step6.vue

@@ -137,6 +137,11 @@
                             <div>{{ stateText(scope.row.state) }}</div>
                         </template>
                     </el-table-column>
+                    <el-table-column
+                            prop="cause"
+                            align="center"
+                            label="原因">
+                    </el-table-column>
                 </el-table>
             </div>
             <el-collapse accordion>
@@ -329,12 +334,11 @@
                             reason: "修改理由",
                             department: "提出部门",
                             responUserName: "提出人",
+                            stateText: "处理意见",
+                            cause: "原因",
                         },
                         dataList: []
                     };
-                    if (title === '上报意见.xls') {
-                        params.columnName.stateText = "处理意见"
-                    }
                     params.dataList = JSON.parse(JSON.stringify(row));
                     params.dataList.forEach(item => {
                         if (item.state === "1") {
@@ -357,7 +361,7 @@
             handleSave() {
             },
             handleSubmit() {
-                    this.isSubmit = true;
+                this.isSubmit = true;
                     var json = this.json;
                     json.hqFlag = '0';
                     json.commentText = this.commentText;

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

@@ -137,6 +137,11 @@
                             <div>{{ stateText(scope.row.state) }}</div>
                         </template>
                     </el-table-column>
+                    <el-table-column
+                            prop="cause"
+                            align="center"
+                            label="原因">
+                    </el-table-column>
                 </el-table>
             </div>
             <el-collapse accordion>
@@ -329,12 +334,11 @@
                             reason: "修改理由",
                             department: "提出部门",
                             responUserName: "提出人",
+                            stateText: "处理意见",
+                            cause: "原因",
                         },
                         dataList: []
                     };
-                    if (title === '上报意见.xls') {
-                        params.columnName.stateText = "处理意见"
-                    }
                     params.dataList = JSON.parse(JSON.stringify(row));
                     params.dataList.forEach(item => {
                         if (item.state === "1") {

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

@@ -137,6 +137,11 @@
                             <div>{{ stateText(scope.row.state) }}</div>
                         </template>
                     </el-table-column>
+                    <el-table-column
+                            prop="cause"
+                            align="center"
+                            label="原因">
+                    </el-table-column>
                 </el-table>
             </div>
             <el-collapse accordion>
@@ -329,12 +334,11 @@
                             reason: "修改理由",
                             department: "提出部门",
                             responUserName: "提出人",
+                            stateText: "处理意见",
+                            cause: "原因",
                         },
                         dataList: []
                     };
-                    if (title === '上报意见.xls') {
-                        params.columnName.stateText = "处理意见"
-                    }
                     params.dataList = JSON.parse(JSON.stringify(row));
                     params.dataList.forEach(item => {
                         if (item.state === "1") {

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

@@ -137,6 +137,11 @@
                             <div>{{ stateText(scope.row.state) }}</div>
                         </template>
                     </el-table-column>
+                    <el-table-column
+                            prop="cause"
+                            align="center"
+                            label="原因">
+                    </el-table-column>
                 </el-table>
             </div>
             <el-collapse accordion>
@@ -344,12 +349,11 @@
                             reason: "修改理由",
                             department: "提出部门",
                             responUserName: "提出人",
+                            stateText: "处理意见",
+                            cause: "原因",
                         },
                         dataList: []
                     };
-                    if (title === '上报意见.xls') {
-                        params.columnName.stateText = "处理意见"
-                    }
                     params.dataList = JSON.parse(JSON.stringify(row));
                     params.dataList.forEach(item => {
                         if (item.state === "1") {