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

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -419,6 +419,16 @@ export default {
         },
         workPath: '',
         comityTel: [],
+        fillPeople: '',
+        fillPeopleId: '',
+        fillUnit: '',
+        fillDept: '',
+        fillPost: '',
+        fillTel: '',
+        fillMail: '',
+        fillLeader: '',
+        fillLeaderId: '',
+        fillFile: [],
       },
       comityNameOptions: [
         {value: '0', label: '国内法规入库流程'},

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue

@@ -241,15 +241,6 @@ export default {
         comityTel: [],
         comityOpRole: '',
         comityInRoleId: '',
-        fillPeople: '',
-        fillPeopleId: '',
-        fillUnit: '',
-        fillDept: '',
-        fillPost: '',
-        fillTel: '',
-        fillMail: '',
-        fillLeader: '',
-        fillLeaderId: '',
       },
       roleForm: {},
       commentText: '',

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue

@@ -409,8 +409,10 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
-        this.rh_pageData.fillLeader = ''
         this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
+        if (this.rh_pageData.fillFile !== undefined) {
+          this.fillFileList = this.rh_pageData.fillFile
+        }
         this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         this.infoSourcesLength = this.rh_pageData.infoSources.length
@@ -521,7 +523,7 @@ export default {
     // 文件上传成功
     handleOnsuccess(res, file, fileList) {
       if (res.ok) {
-        if (this.fillFileList !== null) {
+        if (this.fillFileList.length !== 0) {
           this.newDataList = this.fillFileList
           this.newDataList.push({
             id: res.data.attId,

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue

@@ -107,7 +107,7 @@
                 <el-table-column prop="fillPost" align="center" label="身份"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
+                <el-table-column prop="fillFile" align="center" label="资料">
                   <template slot-scope="scope">
                     <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
                     <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue

@@ -146,7 +146,7 @@
                 <el-table-column prop="fillPost" align="center" label="身份"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
+                <el-table-column prop="fillFile" align="center" label="资料">
                   <template slot-scope="scope">
                     <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
                     <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue

@@ -109,7 +109,7 @@
                 <el-table-column prop="fillPost" align="center" label="身份"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
+                <el-table-column prop="fillFile" align="center" label="资料">
                   <template slot-scope="scope">
                     <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
                     <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue

@@ -112,7 +112,7 @@
                 <el-table-column prop="fillPost" align="center" label="身份"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
+                <el-table-column prop="fillFile" align="center" label="资料">
                   <template slot-scope="scope">
                     <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
                     <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -360,6 +360,16 @@ export default {
         sort: '1',
         meetingTable: [],
         fileTextList: [],
+        fillPeopleId: '',
+        fillPeople: '',
+        fillUnit: '',
+        fillDept: '',
+        fillPost: '',
+        fillTel: '',
+        fillMail: '',
+        fillLeader: '',
+        fillFile: '',
+
       },
       associaNameOptions: [
         {value: '0', label: '国内法规入库流程'},

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue

@@ -214,17 +214,7 @@ export default {
       active: '1',
 
       acceptShow: false,
-      ch_pageData: {
-        fillPeopleId: '',
-        fillPeople: '',
-        fillUnit: '',
-        fillDept: '',
-        fillPost: '',
-        fillTel: '',
-        fillMail: '',
-        fillLeader: '',
-        fillFile: '',
-      },
+      ch_pageData: {},
       ch_rules: {},
       nodeList: [],
       commentText: '',

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -118,31 +118,31 @@
             sortable
             label="标准实施日期">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{
-                  scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '-'
-                }}</span>
+              <span>
+                {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
+              </span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="190px"
             sortable
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{
-                  scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '-'
-                }}</span>
+              <span>
+                {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}
+              </span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             sortable
             width="190px"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{
-                  scope.row.zccssrq ? $moment(scope.row.zccssrq).format('YYYY-MM-DD') : '-'
-                }}</span>
+              <span>
+                {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}
+              </span>
             </template>
           </el-table-column>
           <el-table-column
@@ -165,7 +165,8 @@
               <!--                <el-button @click="changeState(scope.row)">符合性状态</el-button>-->
               <div class="table-jump" @click="changeState(scope.row)">
                 <div v-if="scope.row.unCount === 0">符合</div>
-                <div v-else >不符合</div>
+                <div v-if="scope.row.unCount === 1">不符合</div>
+                <div v-else ></div>
               </div>
             </template>
           </el-table-column>