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

src/pages/localTool/standCalendar/index.vue

@@ -520,7 +520,6 @@ export default {
       localStorage.setItem('objs', JSON.stringify(item))
       this.fileListData = item
       this.reData = item.files
-      console.log(item)
       this.editMeetForm = item
       this.editMeetForm.contents = []
       if (this.editMeetForm.content !== '') {

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

@@ -20,6 +20,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="协会名称:" prop="comityName">
                   <el-select
+                    clearable
                     @change="comityChange"
                     v-model="rh_pageData.comityName"
                     placeholder="请选择标委会">
@@ -34,6 +35,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" v-if="rh_pageData.comityName !== ''" prop="comityNameOne">
                   <el-select
+                    clearable
                     @change="comityChangeOne"
                     v-model="rh_pageData.comityNameOne"
                     placeholder="请选择分标委">
@@ -48,6 +50,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" prop="comityNameTwo" v-if="rh_pageData.comityName !== '' && rh_pageData.comityNameOne !== ''">
                   <el-select
+                    clearable
                     v-model="rh_pageData.comityNameTwo"
                     placeholder="请选择工作组">
                     <el-option
@@ -63,6 +66,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="会员角色:" prop="comityRole">
                   <el-select
+                    clearable
                     v-model="rh_pageData.comityRole"
                     placeholder="请选择会员角色">
                     <el-option
@@ -76,6 +80,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="协会状态:" prop="comityState">
                   <el-select
+                    clearable
                     v-model="rh_pageData.comityState"
                     placeholder="选择协会状态">
                     <el-option
@@ -89,6 +94,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
                   <el-select
+                    clearable
                     v-model="rh_pageData.comityKind"
                     placeholder="请选择入会性质">
                     <el-option

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

@@ -34,6 +34,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="协会名称:">
                   <el-select
+                    clearable
                     @change="comityChange"
                     v-model="ch_pageData.associaName"
                     placeholder="请选择标委会">
@@ -48,6 +49,7 @@
               <el-col :span="8" v-if="ch_pageData.associaName !== ''">
                 <el-form-item class="add-form-item">
                   <el-select
+                    clearable
                     @change="comityChangeOne"
                     v-model="ch_pageData.associaNameOne"
                     placeholder="请选择分标委">
@@ -62,6 +64,7 @@
               <el-col :span="8" v-if="ch_pageData.associaName !== '' && ch_pageData.associaNameOne !== ''">
                 <el-form-item class="add-form-item">
                   <el-select
+                    clearable
                     v-model="ch_pageData.associaNameTwo"
                     placeholder="请选择工作组">
                     <el-option

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

@@ -1574,9 +1574,9 @@
                     { required: false, message: '请输入标准英文名称', trigger: 'blur' },
                     { min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur' }
                   ],
-                    /*standNature: [
+                    standNature: [
                         { required: true, message: '请选择标准性质', trigger: 'change' }
-                    ],*/
+                    ],
                     textStatus: [
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ]

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

@@ -40,7 +40,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
-            <el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
+          <el-table-column prop="itemsNum" label="条款号" align="center"/>
           <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
           <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
             <template slot-scope="scope">
@@ -173,7 +173,7 @@
                 class="common-button-primary"
                 size="mini"
                 v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
-                @click="getTableByPage('')">
+                @click="getTableByPage">
                 查询
               </el-button>
             </el-form-item>
@@ -328,6 +328,7 @@ import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import {startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel, processBack} from '@/api/process.js'
 import {standUnqualified, dicTypeData} from '@/api/unqualProcess.js'
+
 export default {
   name: "wfhxzgStep1",
   data() {
@@ -635,12 +636,10 @@ export default {
       this.addList()
     },
     // 清空 查询条件
-    clearAllSearch (search = true) {
+    clearAllSearch() {
-      this.queryUnqualidiedData = {
+      this.queryUnqualidiedData.standSerialNumber = ''
-        standSerialNumber: '',
+      this.queryUnqualidiedData.productName = ''
-        productName: '',
+      this.queryUnqualidiedData.responsibleUnit = ''
-        responsibleUnit: ''
-      }
       this.getTableByPage()
     },
     // 分页事件
@@ -659,18 +658,22 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .wfhxzgStep1 {
   /deep/ .el-table--scrollable-y .el-table__body-wrapper {
     height: calc(100% - 57px) !important;
   }
+
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -678,6 +681,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -685,21 +689,25 @@ export default {
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content-center {
     padding: 10px 0px 10px 10px;
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -707,6 +715,7 @@ export default {
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;

src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue

@@ -44,7 +44,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
-          <el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
+          <el-table-column prop="itemsNum" label="条款号" align="center"/>
           <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
           <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
             <template slot-scope="scope">
@@ -66,7 +66,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-          <el-collapse-item title="审批意见">
+          <el-collapse-item title="回执说明">
             <div style="margin: 10px 0;">
               <el-input
                 type="textarea"

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

@@ -44,7 +44,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
-          <el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
+          <el-table-column prop="itemsNum" label="条款号" align="center"/>
           <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
           <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
             <template slot-scope="scope">

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

@@ -32,7 +32,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
-          <el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
+          <el-table-column prop="itemsNum" label="条款号" align="center"/>
           <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
           <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
             <template slot-scope="scope">

src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue

@@ -32,7 +32,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
-          <el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
+          <el-table-column prop="itemsNum" label="条款号" align="center"/>
           <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
           <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
             <template slot-scope="scope">

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

@@ -32,7 +32,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
-          <el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
+          <el-table-column prop="itemsNum" label="条款号" align="center"/>
           <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
           <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
             <template slot-scope="scope">

src/pages/processCenter/pages/phone/bzqdfb/step4.vue

@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-show="active == '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>

src/pages/processCenter/pages/processDetail/index.vue

@@ -83,7 +83,7 @@
             sortable="custom"
             align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -91,7 +91,7 @@
             label="完成时间"
             align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
           </template>
         </el-table-column>
         <el-table-column