kllay 12 цаг өмнө
parent
commit
b5b638ffb8

+ 1 - 1
.env.development

@@ -5,7 +5,7 @@ ENV = 'development'
 #线下:http://192.168.100.187:8083
 # 本地环境接口地址 121.36.251.245
 
-VITE_API_URL = 'http://192.168.100.58:8086'
+VITE_API_URL = 'http://1.94.168.85:8086'
 # VITE_API_URL = 'http://192.168.100.187:9084'
 # VITE_API_URL = 'https://backend.qicai321.com'
 VITE_API_WX_URL='https://api.weixin.qq.com/'

+ 2 - 1
src/views/system/borrow/approval/curd.tsx

@@ -300,10 +300,11 @@ export const createCrudOptions = function ({ crudExpose ,context, showRejectDial
 					from:{show:false}
 				},
 				approve_remark: { title: '审批备注', column: {show:false, minWidth: 120 } ,from:{show:false}},
+				// applicant_remark: { title: '审批备注', column: {show:true, minWidth: 120 } ,from:{show:false}},
 				total_items: { title: '设备数量', column: { show:false,minWidth: 80 } },
 				
 				
-				applicant_remark: { title: '申请备注', column: { show:false, minWidth: 120 } },
+				applicant_remark: { title: '申请备注', column: { show:false, minWidth: 120 } ,from:{show:false}},
 				
 				update_datetime: {
 					title: '更新时间',

+ 14 - 2
src/views/system/borrow/component/CollectEquipment/SettlementDialog.vue

@@ -88,6 +88,15 @@
           <div class="form-content">{{ formData.remark || '-' }}</div>
         </div>
         <div v-if="isrenew">
+          <div style="margin-bottom: 8px; font-weight: bold;">续借时间(天)</div>
+          <input
+            v-model.number="renewal_days"
+            type="number"
+            min="1"
+            placeholder="请输入续借天数"
+            style="width: 100%; border: 1px solid #dcdfe6; padding: 8px; box-sizing: border-box;"
+          />
+
           <div style="margin-bottom: 8px; font-weight: bold;">续借理由</div>
           <textarea
             v-model="return_remark"
@@ -132,6 +141,8 @@ const dialogVisible = ref(false);
 const formData = ref<any>({});
 
 const return_remark = ref('')
+const renewal_days = ref(1)
+
 
 watch(
   () => props.visible,
@@ -195,8 +206,9 @@ async function handlerenew(){
     const item = filteredItems.value[i]
 
     const payload = {
-      device: item.device, 
-      quantity: item.quantity, 
+      // device: item.device, 
+      // quantity: item.quantity, 
+      renewal_days:renewal_days.value,
       return_remark: return_remark.value, 
       id: formData.value.id 
     }