src/views/ofm/vehicle_form.vue

@@ -221,6 +221,7 @@ export default {
     getTid (){
 			var that = this;
       that.$API.ofm.vehicleUse.item.req(that.t_id).then(res=>{
+        console.log('res', res)
         that.form = res;
         that.handleEidt(that.t_id);
         if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) {

src/views/srm/paperse.vue

@@ -26,6 +26,11 @@
     <el-main class="nopadding">
       <scTable ref="table" :apiObj="apiObj" row-key="id">
         <el-table-column label="#" type="index"></el-table-column>
+        <el-table-column
+          label="申请部门"
+          prop="belong_dept_name"
+          min-width="60"
+        ></el-table-column>
         <el-table-column
           label="拟发表论文名称"
           prop="paper_name"
@@ -39,12 +44,7 @@
         <el-table-column
           label="作者"
           prop="author"
-          min-width="60"
+          min-width="120"
-        ></el-table-column>
-        <el-table-column
-          label="申请部门"
-          prop="organization"
-          min-width="60"
         ></el-table-column>
         <el-table-column
           label="拟发表文章类型"

src/views/srm/paperse_form.vue

@@ -5,9 +5,6 @@
       <el-form-item label="拟发表论文名称" prop="paper_name">
           <el-input v-model="localForm.paper_name" clearable :disabled="localMode ==='show'"></el-input>
       </el-form-item>
-      <el-form-item label="申请部门" prop="orginization">
-          <el-input v-model="localForm.organization" clearable :disabled="localMode ==='show'"></el-input>
-      </el-form-item>
       <el-form-item label="拟投期刊名称" prop="publication_name">
           <el-input v-model="localForm.publication_name" clearable :disabled="localMode ==='show'"></el-input>
       </el-form-item>
@@ -155,16 +152,6 @@ export default {
   methods: {
     async submit_b_func() {
 		    let that = this;
-        if(that.localForm.ticket_?.state_?.name == '总经理审批'){
-        const papertData = {
-            paper: that.localForm.id,
-            pa_type: that.localForm.pa_type,
-            author: that.localForm.author,
-            organization: that.localForm.organization 
-        };
-        console.log('7777777777',papertData)
-        that.$API.srm.paperrecord.create.req(papertData);
-      }
         if(that.localForm?.id){
           that.localMode = "edit";
         }

src/views/srm/patent.vue

@@ -28,7 +28,7 @@
         <el-table-column label="#" type="index"></el-table-column>
         <el-table-column
           label="申请部门"
-          prop="organization"
+          prop="belong_dept_name"
           min-width="60"
         ></el-table-column>
         <el-table-column
@@ -39,12 +39,12 @@
         <el-table-column
           label="发明人（设计人）"
           prop="author"
-          min-width="60"
+          min-width="120"
         ></el-table-column>
         <el-table-column
           label="拟申请专利类型"
           prop="type"
-          min-width="60">
+          min-width="120">
           <template #default="scope">
             {{patentType[scope.row.type]}}
           </template>
@@ -69,7 +69,7 @@
           prop="other_area"
           min-width="60"
         ></el-table-column>
-        <el-table-column label="技术状态" prop="tech_status" min-width="160">
+        <el-table-column label="技术状态" prop="tech_status" min-width="200">
             <template #default="{row}">
                 <div v-if="row.tech_status && row.tech_status.length">
                     <div v-for="(item, index) in row.tech_status" :key="index">
@@ -87,7 +87,7 @@
              <span v-else>—</span>
         </template>
         </el-table-column>
-        <el-table-column label="技术文件" prop="tech_file" min-width="160">
+        <el-table-column label="技术文件" prop="tech_file" min-width="120">
             <template #default="{row}">
                 <div v-if="row.tech_file && row.tech_file.length">
                     <div v-for="(item, index) in row.tech_file" :key="index">
@@ -189,6 +189,27 @@ export default {
       this.limitedVisible = true;
     },
     
+    // getDefaultForm(){
+    //   return {
+    //     name: "",
+    //     author: "",
+    //     type: "",
+    //     is_public: false,
+    //     area: null,
+    //     other_area: null,
+    //     tech_status: [{ name: "是否进行过科技成果鉴定", status: "",  fileList: [] },
+    //     { name: "是否发表过文章", status: "", fileList: [] },
+    //     { name: "是否参与过展会展出", status: "", fileList: [] },
+    //     { name: "是否应用于生产/销售", status: "", fileList: [] },
+    //     { name: "是否参与过技术交流", status: "", fileList: [] }],
+    //     tech_file: [ { name: "技术背景材料", status: "", pages: "" },
+    //     { name: "技术交底材料", pages: "" },
+    //     { name: "查新检索报告", pages: "" },
+    //     { name: "图或者照片", pages: "" }],
+    //     ticket_:null
+    //   }
+    // },
+    // 审批流结束之后才可以编辑
     patentShow(row) {
       this.mode = "show";
       this.t_id = row.id;

src/views/srm/patent_form.vue

@@ -5,9 +5,6 @@
       <el-form-item label="拟申请专利名称" prop="name">
           <el-input v-model="localForm.name" clearable :disabled="localMode ==='show'"></el-input>
       </el-form-item>
-      <el-form-item label="申请部门" prop="organization">
-          <el-input v-model="localForm.organization" clearable :disabled="localMode ==='show'"></el-input>
-      </el-form-item>
       <el-form-item label="发明人（设计人）" 
         prop="author" 
         >
@@ -166,15 +163,6 @@ export default {
   methods: {
     async submit_b_func() {
 		  let that = this;
-      if(that.localForm.ticket_?.state_?.name == '总经理审批'){
-        const patentData = {
-          patent: that.localForm.id,
-          pc_type: that.localForm.type,
-          inventors: that.localForm.author,
-          organization: that.localForm.organization 
-        };
-        that.$API.srm.patentrecord.create.req(patentData);
-      }
       if(that.localForm?.id){
         that.localMode = "edit";
       }
@@ -182,7 +170,7 @@ export default {
 				let res = await that.$API.srm.patentinfo.create.req(that.localForm);
 				that.localForm.id = res.id;
 			} else if (that.localMode == "edit") {
-			    that.$API.srm.patentinfo.update.req(that.localForm.id, that.localForm);
+			    await that.$API.srm.patentinfo.update.req(that.localForm.id, that.localForm);
 			}
 		},
     getTid (){