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

# Conflicts:
#	src/pages/processCenter/pages/creatProcess/bzpg/step1.vue

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

@@ -367,6 +367,10 @@
                         <div v-else style="height: 100%;">
                             <div style="margin: 10px 5px;">比对条款: {{ editForm.itemsNum }}</div>
                             <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
+                            <div style="height: 40px;overflow: auto;display: flex;">
+                              <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准</span></div>
+                              <div  style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准</span></div>
+                            </div>
                             <div style="overflow: auto;display: flex;" class="BDclass">
                                 <div v-html="leftData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
                                 <div v-html="rightData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -459,6 +463,10 @@
                 size="1100px">
             <div>比对条款: {{ itemsNum }}</div>
             <div>相似度: {{ similarityDegree }}</div>
+          <div style="height: 40px;overflow: auto;display: flex;">
+            <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准</span></div>
+            <div  style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准</span></div>
+          </div>
             <div class="contentCom">
                 <div class="content-left">
                     <div v-for="(item,index) in leftData" v-html="item" :key="index"></div>

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

@@ -280,6 +280,10 @@
                 size="1100px">
             <div>比对条款: {{ itemsNum }}</div>
             <div>相似度:{{ similarityDegree }}</div>
+            <div style="height: 40px;overflow: auto;display: flex;">
+              <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准</span></div>
+              <div  style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准</span></div>
+            </div>
             <div style="height: 600px;overflow: auto;display: flex;">
                 <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
                 <div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>

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

@@ -285,6 +285,10 @@
                 size="1100px">
             <div>比对条款: {{ itemsNum }}</div>
             <div>相似度:{{ similarityDegree }}</div>
+            <div style="height: 40px;overflow: auto;display: flex;">
+              <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准</span></div>
+              <div  style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准</span></div>
+            </div>
             <div style="height: 600px;overflow: auto;display: flex;">
                 <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
                 <div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>

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

@@ -286,6 +286,10 @@
                 size="1100px">
             <div>比对条款: {{ itemsNum }}</div>
             <div>相似度:{{ similarityDegree }}</div>
+            <div style="height: 40px;overflow: auto;display: flex;">
+              <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准</span></div>
+              <div  style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准</span></div>
+            </div>
             <div style="height: 600px;overflow: auto;display: flex;">
                 <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
                 <div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>

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

@@ -554,31 +554,7 @@ export default {
         standNumber: ""
       },
       taskIds: this.$route.query.taskIds,
-      decomposeOptions: [{
-        value: "CA",
-        label: "草稿",
-        item: "CA"
-      },
-        {
-          value: "ZQYJG",
-          label: "征求意见稿",
-          item: "ZQYJG"
-        },
-        {
-          value: "BPG",
-          label: "报批稿",
-          item: "BPG"
-        },
-        {
-          value: "SSG",
-          label: "送审稿",
-          item: "SSG"
-        },
-        {
-          value: "FBGBJBD",
-          label: "发布稿（必读）",
-          item: "FBGBJBD"
-        }], //分解单数据
+      decomposeOptions: [], //分解单数据
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -674,7 +650,8 @@ export default {
             projectName: "",
             projectPlatfor: ""
           }]
-        }]
+        }],
+        fileType: ''
       },
       choiceForm: {}, //选择标准清单列表
       showColumn: true,
@@ -752,11 +729,13 @@ export default {
           this.roleForm.ministerUserName = item.form.ministerUserName
           this.submitFlag = '修改节点'
           this.dataList.distributePerson =  this.listForm.dataList[0].distributePerson
-          // this.$http.get("SarStandItems/sar-stand-items/getFileType", {
-          //   standId: item.standId
-          // }, {}, res => {
-          //   this.decomposeOptions = res.data;
-          // });
+          // this.listForm.fileType = ''
+          this.$http.get("SarStandItems/sar-stand-items/getFileType", {
+            standId: item.standId
+          }, {}, res => {
+            this.decomposeOptions = res.data;
+            // decomposeOptions = ; //分解单数据
+          });
         }else{
           this.hisListForm =  JSON.parse(JSON.stringify(item))
           this.listForm = JSON.parse(JSON.stringify(item))
@@ -775,11 +754,12 @@ export default {
           this.qualityEngineer = item.qualityEngineer
           this.submitFlag = '修改节点'
           this.dataList.distributePerson =  this.listForm.dataList[0].distributePerson
-          // this.$http.get("SarStandItems/sar-stand-items/getFileType", {
-          //   standId: item.standId
-          // }, {}, res => {
-          //   this.decomposeOptions = res.data;
-          // });
+          // this.listForm.fileType = ''
+          this.$http.get("SarStandItems/sar-stand-items/getFileType", {
+            standId: item.standId
+          }, {}, res => {
+            this.decomposeOptions = res.data;
+          });
         }
       })
     },
@@ -1127,18 +1107,23 @@ export default {
     //选择拆分标准确定事件
     OkDrawer() {
       if (this.selectedList.length === 1) {
-        this.listForm.standNumber = this.selectedList[0].standSortShow + "\xa0\xa0" + this.selectedList[0].standNumber + "-" + this.selectedList[0].standYear;
+        if(this.selectedList[0].standYear){
+          this.listForm.standNumber = this.selectedList[0].standSortShow + "\xa0\xa0" + this.selectedList[0].standNumber + "-" + this.selectedList[0].standYear;
+        }else{
+          this.listForm.standNumber = this.selectedList[0].standSortShow + "\xa0\xa0" + this.selectedList[0].standNumber ;
+        }
         this.listForm.standName = this.selectedList[0].standName;
         this.listForm.standType = this.selectedList[0].standType;
         this.listForm.standId = this.selectedList[0].id;
         this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj;
         this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj;
         this.listForm.id = this.selectedList[0].id;
-        // this.$http.get("SarStandItems/sar-stand-items/getFileType", {
-        //   standId: this.selectedList[0].id
-        // }, {}, res => {
-        //   this.decomposeOptions = res.data;
-        // });
+        this.listForm.fileType = ''
+        this.$http.get("SarStandItems/sar-stand-items/getFileType", {
+          standId: this.selectedList[0].id
+        }, {}, res => {
+          this.decomposeOptions = res.data;
+        });
         this.ListModel = false;
       } else if (this.selectedList.length > 1) {
         this.$message.warning("您只能选择一条数据进行带入");
@@ -1278,21 +1263,23 @@ export default {
           this.dataList = mes.form.dataList;
           this.roleForm = mes.roleForm
           this.commentText = mes.commentText
-          // this.$http.get("SarStandItems/sar-stand-items/getFileType", {
-          //   standId: mes.form.standId
-          // }, {}, res => {
-          //   this.decomposeOptions = res.data;
-          // });
+          // this.listForm.fileType = ''
+          this.$http.get("SarStandItems/sar-stand-items/getFileType", {
+            standId: mes.form.standId
+          }, {}, res => {
+            this.decomposeOptions = res.data;
+          });
         }else{
           this.listForm = mes.json.form;
           this.dataList = mes.json.form.dataList
           this.roleForm =  mes.json.roleForm;
           this.commentText = mes.json.commentText;
-          // this.$http.get("SarStandItems/sar-stand-items/getFileType", {
-          //   standId: mes.json.form.standId
-          // }, {}, res => {
-          //   this.decomposeOptions = res.data;
-          // });
+          // this.listForm.fileType = ''
+          this.$http.get("SarStandItems/sar-stand-items/getFileType", {
+            standId: mes.json.form.standId
+          }, {}, res => {
+            this.decomposeOptions = res.data;
+          });
         }
       });
     },

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

@@ -162,11 +162,11 @@
                   </el-date-picker>
                 </el-form-item>
                 <el-form-item v-if="verifySarStandard" label="归档位置" prop="treeListName" class="add-form-item form-item-disabled">
+                  <el-input :disabled="disabledXX"
+                            v-show="false"
+                            v-model="form.treeListId"
+                  ></el-input>
                   <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
-                    <el-input :disabled="disabledXX"
-                      v-show="false"
-                      v-model="form.treeListId"
-                    ></el-input>
                     <el-input :disabled="disabledXX"
                       v-model="form.treeListName"
                       clearable