feat: ofm-borrow 修改档案借阅审批流

src/views/ofm/borrowfile.vue

@@ -71,7 +71,7 @@
               v-auth="'fileborrow.update'"
               >详情
             </el-button>
-            <!-- <el-popconfirm
+            <el-popconfirm
               title="确定删除吗？"
               @confirm="borrowDel(scope.row)"
             >
@@ -84,7 +84,7 @@
                   >删除</el-button
                 >
               </template>
-            </el-popconfirm> -->
+            </el-popconfirm>
           </template>
         </el-table-column>
       </scTable>
@@ -100,7 +100,6 @@
       <borrowlForm
         :mode="type"
         v-model="addForm"
-        :lending_type="lending_type"
         @success="()=>{handleQuery(); limitedVisible = false}"
         @closed="limitedVisible = false"
       />
@@ -193,16 +192,16 @@ export default {
       this.limitedVisible = true;
       this.addForm = Object.assign({}, row);
     },
-    // async borrowDel(row) {
+    async borrowDel(row) {
-    //   var id = row.id;
+      var id = row.id;
-    //   var res = await this.$API.ofm.borrow.delete.req(id);
+      var res = await this.$API.ofm.borrow.delete.req(id);
-    //   if (res.err_msg) {
+      if (res.err_msg) {
-    //     this.$message.error(res.err_msg);
+        this.$message.error(res.err_msg);
-    //   } else {
+      } else {
-    //     this.$refs.table.refresh();
+        this.$refs.table.refresh();
-    //     this.$message.success("删除成功");
+        this.$message.success("删除成功");
-    //   }
+      }
-    // },
+    },
   //搜索
     handleQuery() {
       this.$refs.table.queryData(this.query);

src/views/ofm/borrowfile_form.vue

@@ -32,14 +32,13 @@
                 >
                 </el-date-picker>
             </el-form-item>
-            <el-form-item label="归还时间" prop="return_date">
+            <el-form-item label="归还时间" prop="return_date" v-if="addForm.ticket_?.state_?.name=='档案管理员审批'">
                 <el-date-picker
                 v-model="addForm.return_date"
                 type="date"
                 placeholder="选择日期时间"
                 align="right"
                 value-format="YYYY-MM-DD"
-                :disabled="mode==='view'"
                 >
                 </el-date-picker>
             </el-form-item>
@@ -58,16 +57,17 @@
             :title="ticketTitle"
             :t_id="addForm.id"
             :ticket_="addForm.ticket_"
+            :ticket_data="ticket_data"
             :submit_b_func="submit"
             ref="ticketd_b_start"
             @success="$emit('success')"
           />
-          <el-button @click="$emit('closed')">取消</el-button>
     </el-footer>
     </el-main>
         <el-aside v-if="addForm.ticket">
             <ticketd
             :ticket_="addForm.ticket_"
+            :ticket_data="ticket_data"
             @success="$emit('success')"
             style="margin-top: 20px;"
             />
@@ -97,6 +97,7 @@ export default {
       addForm: {...this.modelValue},
       query: {},
       fileList: [],
+      ticket_data: {},
       rules: {
         file_name: [
           { required: true, message: "请选择档案", trigger: "blur" },
@@ -107,11 +108,33 @@ export default {
   mounted(){
     this.getFileList();
   },
+  watch: {
+    modelValue: {
+        handler(val) {
+            this.addForm = { ...val };
+        },
+        deep: true,
+        },
+        // 本地数据变动 -> 同步回父组件
+    addForm: {
+        handler(val) {
+            this.$emit("update:modelValue", val);
+        },
+        deep: true,
+    },
+    addForm: {
+      handler(val){
+        Object.assign(this.ticket_data,{
+          return_date: val.return_date,
+        })
+      },
+      deep: true,
+    }
+  },
   methods: {
     async submit() {
       let that = this;
       let res = null;
-      this.ticketTitle = `${this.addForm.file_name}-档案借阅`;
 
     if (that.mode === "add") {
         res = await that.$API.ofm.borrow.create.req(that.addForm);

src/views/ofm/vehicle.vue

@@ -124,7 +124,6 @@
             :transitions="transitions"
             @success="()=>{handleQuery(); limitedVisible = false}"
             @closed="limitedVisible = false"
-            @submit="saveVehicle"
       />
         </div>
   </div>