Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

src/views/ofm/booking_form.vue

@@ -72,7 +72,7 @@
             :title="form.title+'-会议室预定'" 
             :t_id="form.id" 
             :ticket_="form.ticket_"
-            @success="()=>{$emit('success')}" 
+            @success="()=>{$emit('success', localMode)}" 
             :submit_b_func="submit_b_func" 
             ref="ticketd_b"
           ></ticketd_b>

src/views/ofm/borrowfile_form.vue

@@ -64,7 +64,7 @@
             :ticket_data="ticket_data"
             :submit_b_func="submit_b_func"
             ref="ticketd_b"
-            @success="$emit('success')"
+            @success="$emit('success', localMode)"
           />
     </el-footer>
     </el-main>
@@ -118,7 +118,10 @@ export default {
     let that = this;
     if (that.t_id){
         this.getTid();
-      };
+      }else {
+      that.localMode = "add";
+      that.addForm.belong_dept = that.$TOOL.data.get("USER_INFO").belong_dept;
+    };
   },
   watch: {
     addForm: {

src/views/ofm/mroom.vue

@@ -148,8 +148,6 @@ export default {
 
     async submit() {
       let that = this,res = null;
-      console.log('that.type',that.type);
-      console.log('that.addForm',that.addForm);
       try {
         if (that.type === "add") {
           res = await that.$API.ofm.mroom.create.req(that.addForm);

src/views/ofm/publicity.vue

@@ -104,7 +104,11 @@
       </scTable>
     </el-main>
   </el-container>
-  <el-drawer title="宣传报道" v-model="limitedVisible" direction="rtl" size="70%">
+  <el-drawer  
+      title="宣传报道" 
+      v-model="limitedVisible" 
+      direction="rtl" size="70%" 
+      :destroy-on-close="true">
     <div style="display: flex; height: calc(100% - 60px);"> 
       <div style="flex: 1; padding-right: 20px; overflow-y: auto;">
         <publicity

src/views/ofm/publicityForm.vue

@@ -138,7 +138,7 @@
             :ticket_data="ticket_data"
             :submit_b_func="submit_b_func"
             ref="ticketd_b"
-            @success="$emit('success')"
+            @success="$emit('success', localMode)"
             />    
     </el-footer>
     </el-main>
@@ -186,11 +186,13 @@ export default {
     let that = this;
     if (that.t_id) {
       that.getTid();
-      };
+      }else {
+      that.localMode = "add";
+      that.addForm.belong_dept = that.$TOOL.data.get("USER_INFO").belong_dept;
+    }
     },
   watch: {
         'addForm.dept_opinion'(val) {
-          console.log('addForm.dept_opinion 发生变化',val)
           this.ticket_data.dept_opinion = val
         },
         'addForm.secret_period'(val) {
@@ -200,14 +202,12 @@ export default {
           this.ticket_data.secret_level = val
         },
         'addForm.disposal_method'(val) {
-          console.log('addForm.disposal_method 发生变化',val)
           this.ticket_data.disposal_method = val
         },
         'addForm.dept_opinion_review'(val) {
           this.ticket_data.dept_opinion_review = val
         },
         'addForm.publicity_opinion'(val) {
-          console.log('addForm.publicity_opinion 发生变化',val)
           this.ticket_data.publicity_opinion = val
         },
         deep:true

src/views/ofm/sealForm.vue

@@ -97,7 +97,7 @@
             :ticket_="localForm.ticket_"
             :submit_b_func="submit_b_func"
             ref="ticketd_b"
-            @success="$emit('success')"
+            @success="$emit('success', localMode)"
           />
     </el-footer>
     </el-main>
@@ -140,7 +140,10 @@ export default {
     let that = this;
     if (that.t_id) {
       that.getTid();
-      }
+      }else {
+      that.localMode = "add";
+      that.localForm.belong_dept = that.$TOOL.data.get("USER_INFO").belong_dept;
+    }
     },
   watch: {
     'localForm.actual_return_date'(val) {

src/views/ofm/vehicleForm.vue

@@ -42,7 +42,7 @@
                 value-format="YYYY-MM-DD HH:mm:ss"
                 unlink-panels
                 placeholder="选择日期"
-                :disabled="mode==='show'"
+                :disabled="localMode==='show'"
                 >
                 </el-date-picker>
             </el-form-item>
@@ -67,7 +67,7 @@
             :ticket_="addForm.ticket_"
             :ticket_data="ticket_data"
             ref="ticketd_b"
-            @success="$emit('success')"
+            @success="$emit('success', localMode)"
             />
         </el-footer>
       </el-main>
@@ -111,7 +111,10 @@ export default {
       let that = this;
       if (that.t_id) {
         that.getTid();
-      }
+      }else {
+      that.localMode = "add";
+      that.addForm.belong_dept = that.$TOOL.data.get("USER_INFO").belong_dept;
+    }
     },
     watch: {
         addForm: {

src/views/srm/paperse.vue

@@ -174,25 +174,6 @@ export default {
       this.t_id = null;
       this.limitedVisible = true;
     },
-    // getDefaultForm(){
-    //   return {
-    //     paper_name: "",
-    //     publication_name:"",                     
-    //     author: "",
-    //     paper_type: "",
-    //     is_chinese_core: false,
-    //     is_sci: false,
-    //     tech_status: [{ name: "是否进行过科技成果鉴定", status: "",  fileList: [] },
-    //     { name: "是否发表过文章", status: "", fileList: [] },
-    //     { name: "是否参与过展会展出", status: "", fileList: [] },
-    //     { name: "是否应用于生产/销售", status: "", fileList: [] },
-    //     { name: "是否参与过技术交流", status: "", fileList: [] }],
-    //     tech_file: [ { name: "论文内容", status: "", pages: "" },
-    //     { name: "图或者照片", pages: "" }],
-    //     ticket_:null
-    //   }
-    // },
-    // 审批流结束之后才可以编辑
     paperseShow(row) {
       this.mode = "show";
       this.t_id = row.id;

src/views/srm/paperse_form.vue

@@ -84,7 +84,7 @@
             :ticket_data="ticket_data"
             :submit_b_func="submit_b_func"
             ref="ticketd_b"
-            @success="$emit('success')"
+            @success="$emit('success', localMode)"
           />
     </el-footer>
     </el-main>
@@ -144,7 +144,10 @@ export default {
     let that = this;
     if (that.t_id) {
       that.getTid();
-    }
+    }else {
+      that.localMode = "add";
+      that.localForm.belong_dept = that.$TOOL.data.get("USER_INFO").belong_dept;
+    };
   },
   methods: {
     async submit_b_func() {

src/views/srm/patent_form.vue

@@ -93,7 +93,7 @@
             :ticket_data="ticket_data"
             :submit_b_func="submit_b_func"
             ref="ticketd_b"
-            @success="$emit('success')"
+            @success="$emit('success', localMode)"
           />
     </el-footer>
     </el-main>
@@ -155,7 +155,10 @@ export default {
     let that = this;
     if (that.t_id) {
       that.getTid();
-    }
+    }else {
+      that.localMode = "add";
+      that.localForm.belong_dept = that.$TOOL.data.get("USER_INFO").belong_dept;
+    };
   },
   methods: {
     async submit_b_func() {

src/views/srm/plat.vue

@@ -72,7 +72,6 @@
               size="small"
               type="primary"
               @click="paperseEdit(scope.row)"
-              v-auth="'PaperSe.update'"
               >详情
             </el-button>
             <el-popconfirm

src/views/srm/plat_form.vue

@@ -79,7 +79,7 @@
             :ticket_data="ticket_data"
             :submit_b_func="submit_b_func"
             ref="ticketd_b"
-            @success="$emit('success')"
+            @success="$emit('success', localMode)"
             @colsed="$emit('closed')"
           />
     </el-footer>
@@ -122,9 +122,6 @@ export default {
         ...(this.modelValue || {}) }
     };
   },
-  mounted() {
-    console.log('mode', this.localMode)
-  },
   watch: {
         localForm: {
           handler(val) {