领料审核联调

src/pages/business/leaseApply.vue

@@ -22,9 +22,9 @@
                         @clear="clearPro"
                     ></eselect>
                 </uni-forms-item>
-                 <uni-forms-item label="采购申请编号" name="applyCode" required>
+                 <!-- <uni-forms-item label="采购申请编号" name="applyCode" required>
                     <uni-easyinput v-model="formData.applyCode" maxlength="10" placeholder="请输入采购申请编号" />
-                </uni-forms-item>
+                </uni-forms-item> -->
                 <uni-forms-item label="领料人" name="leasePerson" required>
                     <uni-easyinput v-model="formData.leasePerson" maxlength="10" placeholder="请输入领料人" />
                 </uni-forms-item>
@@ -148,7 +148,7 @@ const formData = ref({
         leasePerson: '',
         phone: '',
         configId: '',
-        applyCode: '',
+        // applyCode: '',
         code:''
     }
 })
@@ -192,15 +192,15 @@ const rules = ref({
             }
         ]
     },
-    applyCode: {
+    // applyCode: {
-        rules: [
+    //     rules: [
-            {
+    //         {
-                required: true,
+    //             required: true,
-                errorMessage: '采购申请编号为必填项',
+    //             errorMessage: '采购申请编号为必填项',
-                trigger: 'blur'
+    //             trigger: 'blur'
-            }
+    //         }
-        ]	
+    //     ]	
-    },
+    // },
     leasePerson: {
         rules: [
             {
@@ -485,7 +485,7 @@ const submitNum = async() => {
                     "phone":formData.value.phone,
                     "code": formData.value.code,
                     "standardConfigId":configId.value,
-                    "applyCode":formData.value.applyCode,
+                    // "applyCode":formData.value.applyCode,
                     "bmFileInfos": bmFileInfos.value,
                 },
                 "leaseApplyDetailsList":typeList.value

src/pages/picking/review/details.vue

@@ -58,7 +58,11 @@
                         }"
                     >
                         {{ item.isAccept == 0 ? '待审批' : item.isAccept == 1 ? '已通过' : '已驳回' }}
-                        {{ item.createTime ? ` ${item.createTime}` : '' }}
+                        <br />
+                        <text class="black-text">{{ item.auditBy ? item.auditBy : '' }}</text>
+                        <br />
+                        <!-- 显示创建时间，使用新的 CSS 类设置文字颜色为黑色 -->
+                        <text class="black-text">{{ item.createTime ? item.createTime : '' }}</text>
                     </text>
                 </view>
             </view>
@@ -271,6 +275,7 @@ const fetchAuditInfo = async () => {
         const res = await getAuditInfoAPI({taskId:queryParams.value.taskId})
         console.log('🚀 ~ fetchAuditInfo ~ res:', res)
         auditingList.value = res.rows
+
         console.log('🚀 ~ fetchAuditInfo ~ auditingList:', auditingList.value)
     } catch (error) {
         // 打印错误信息
@@ -302,7 +307,7 @@ const getCodeDeviceListData = async () => {
 const handleReview = (action) => {
     uni.showModal({
         title: action == 1 ? '通过' : '驳回',
-        content: '请输入审核意见',
+        placeholderText: '请输入审核意见',
         editable: true,
         confirmText: '确认',
         cancelText: '取消',
@@ -398,7 +403,9 @@ const onHandleOutbound = async () => {
 
 <style lang="scss" scoped>
 
-
+.black-text {
+    color: #000;
+}
 .custom-steps {
     margin-bottom: 5px;
 }
@@ -430,15 +437,15 @@ const onHandleOutbound = async () => {
 }
 
 .step-icon.pending {
-    background-color: #fadb14;
+    background-color: #19a4a0;
 }
 
 .step-icon.approved {
-    background-color: #52c41a;
+    background-color: #19a4a0;
 }
 
 .step-icon.rejected {
-    background-color: #ff4d4f;
+    background-color: #19a4a0;
 }
 
 .step-line {
@@ -447,15 +454,15 @@ const onHandleOutbound = async () => {
     left: 50%;
     width: 100%;
     height: 2px;
-    background-color: #d9d9d9;
+    background-color: #19a4a0;
 }
 
 .step-line.approved {
-    background-color: #52c41a;
+    background-color: #19a4a0;
 }
 
 .step-line.rejected {
-    background-color: #ff4d4f;
+    background-color: #19a4a0;
 }
 
 .step-content {
@@ -466,39 +473,42 @@ const onHandleOutbound = async () => {
 }
 
 .step-title {
-    font-size: 14px;
+    font-size: 11px;
-    font-weight: 500;
+    font-weight: 400;
     margin-bottom: 3px;
     text-align: center;
 }
 
 .step-title.pending {
-    color: #fadb14;
+    color: #19a4a0;
 }
 
 .step-title.approved {
-    color: #52c41a;
+    color: #19a4a0;
 }
 
 .step-title.rejected {
-    color: #ff4d4f;
+    color: #19a4a0;
 }
 
 .step-desc {
-    font-size: 12px;
+    font-size: 10px;
     text-align: center;
     color: #8c8c8c; // 默认颜色
 }
 
 .step-desc.pending {
-    color: #fadb14; // 待审批黄色
+    font-size: 10px;
+    color: #409EFF; // 待审批黄色
 }
 
 .step-desc.approved {
-    color: #52c41a; // 已通过绿色
+    font-size: 10px;
+    color: #13ce66; // 已通过绿色
 }
 
 .step-desc.rejected {
+    font-size: 10px;
     color: #ff4d4f; // 已驳回红色
 }
 .page-container {

src/pages/picking/review/index.vue

@@ -147,7 +147,7 @@ const queryParams = ref({
     startTime: '', //                   开始时间
     endTime: '', //                     结束时间
     keyWord: '', //                     关键字
-    // statusList: [4], //                 状态
+    statusList: [4], //                 状态
     pageNum: 1,
     pageSize: 3,
 })
@@ -255,11 +255,11 @@ const changeTab = (index) => {
     active.value = index
     console.log('index', index)
     if (index == 2) {
-        // queryParams.value.statusList = [3] // 查已完成的
+        queryParams.value.statusList = [2,3] // 查已完成的
         queryParams.value.pageNum = 1
         getTableList(true)
     } else if (index == 1) {
-        // queryParams.value.statusList = [4] // 查未完成的
+        queryParams.value.statusList = [0,1] // 查未完成的
         queryParams.value.pageNum = 1
         getTableList(true)
     }