Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!270

src/pages/details/otherStandardDetails/index.vue

@@ -90,7 +90,7 @@
                           </span>
 <!--                          多个文件时-->
                           <span v-else-if="child.value && child.value.length > 0">
-                            <div style="margin-left: 15%;margin-top: -60px;line-height: 90px">
+                            <div style="margin-left: 19%;margin-top: -60px;line-height: 90px">
                               <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                                  @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                  :title="file.oldFileName">{{ file.oldFileName }}</a>

src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue

@@ -35,6 +35,7 @@
                                 <el-form-item label="完成时间" prop="date" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             v-model="form.date"
+                                            :picker-options="pickerOptions"
                                             type="date"
                                             placeholder="请选择完成时间">
                                     </el-date-picker>
@@ -261,6 +262,11 @@
         name: "bzdyStep1-1",
         data() {
             return {
+                pickerOptions: {
+                    disabledDate(time) {
+                        return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
+                    }
+                },
                 drawerTitle2: '',
                 type2: '',
                 foldFormFlag: false,
@@ -355,7 +361,11 @@
                     bpnId: this.$route.query.bpnId
                 }).then(res => {
                     let mes = JSON.parse(res.mes)
-                    mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                    if (mes.form.date) {
+                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                    } else {
+                        mes.form.date = ''
+                    }
                     this.form = mes.form
                     this.roleForm = mes.roleForm
                     this.commentText = mes.commentText

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

@@ -535,6 +535,8 @@ export default {
         roleForm: this.roleForm,
         commentText: this.commentText
       }))
+      console.log(this.form);
+      return
       saveTaskFirst(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -26,7 +26,7 @@
                         <span
                             :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
                         <span style="font-size:12px"> {{ node.label }} </span>
-                        <span>
+                        <!--<span>
                           <el-button
                               type="text"
                               size="mini"
@@ -48,7 +48,7 @@
                               @click="() => remove(node, data)">
                             删除
                           </el-button>
-                        </span>
+                        </span>-->
                       </span>
             </el-tree>
           </el-card>

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -25,7 +25,7 @@
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
                         <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
                         <span style="font-size:12px"> {{ node.label }} </span>
-                        <span>
+                       <!-- <span>
                           <el-button
                                   type="text"
                                   size="mini"
@@ -47,7 +47,7 @@
                                   @click="() => remove(node, data)">
                             删除
                           </el-button>
-                        </span>
+                        </span>-->
                       </span>
           </el-tree>
           </el-card>

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -24,7 +24,7 @@
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
                         <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
                         <span style="font-size:12px"> {{ node.label }} </span>
-                        <span>
+                       <!-- <span>
                           <el-button
                             type="text"
                             size="mini"
@@ -46,7 +46,7 @@
                             @click="() => remove(node, data)">
                             删除
                           </el-button>
-                    </span>
+                    </span>-->
               </span>
             </el-tree>
           </el-card>