From 2f8e6028653c1f45f10b2709265e9e2cc4fc42fc Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Wed, 26 Feb 2025 18:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/apis.js                                  |  15 +
 apis/http.js                                  |   5 +-
 pages.json                                    |   6 +
 .../backMaterialReceive.vue                   |  26 +-
 .../exitMaterialSelect/exitMaterialSelect.vue |   1 +
 .../exitMaterialSelectEdit.vue                | 448 ++++++++++++++++++
 router.js                                     |   7 +
 7 files changed, 503 insertions(+), 5 deletions(-)
 create mode 100644 pages/exitMaterialSelect/exitMaterialSelectEdit.vue

diff --git a/apis/apis.js b/apis/apis.js
index 85ec947..f9e318c 100644
--- a/apis/apis.js
+++ b/apis/apis.js
@@ -364,6 +364,14 @@ const exitMaterial = {
             header
         );
     },
+    async subExitMaterialEdit(data = {}, header = {}) {
+        return await Http.post(
+            HttpConfig.basePath,
+            HttpConfig.serviceUrl.exitMaterial.subExitMaterialEdit,
+            data,
+            header
+        );
+    },
     async delMaterial(data = {}, header = {}) {
         return await Http.post(
             HttpConfig.basePath,
@@ -388,6 +396,13 @@ const exitMaterial = {
             header
         );
     },
+    async selectMaterialEdit(data = {}) {
+        return await Http.get(
+            HttpConfig.basePath,
+            HttpConfig.serviceUrl.exitMaterial.selectMaterialEdit,
+            data
+        );
+    },
     async ifAgreement(data = {}, header = {}) {
         return await Http.post(
             HttpConfig.systemPath,
diff --git a/apis/http.js b/apis/http.js
index dfb7426..dd8ad75 100644
--- a/apis/http.js
+++ b/apis/http.js
@@ -96,10 +96,12 @@ class HttpConfig {
             exitDeptList: "/back_apply/getbackUnit", // 获取退料单位，工程列表
             exitMaterialList: "/back_apply/getbackList", // 获取机具退料列表
             exitMaterialDetail: "/back_apply/view", // 获取退料设备详情
-            subExitMaterial: "/back_apply/upload", // 提交退料清单
+            subExitMaterial: "/back_apply/upload", // 编辑下提交退料清单
+            subExitMaterialEdit: "/backReceive/updateBackApply", // 提交退料清单
             delMaterial: "/back_apply/del", // 删除退料申请
             newExitList: "/back_apply/addBackTask", // 新建退料任务单
             selectMaterial: "/back_apply/materialList", // 退料物料选择
+            selectMaterialEdit: "/backReceive/getDetailsReceiveList", // 编辑下退料物料选择
             ifAgreement: "/select/getAgreementInfoById", // 单位id和工程id是否匹配
         },
         exitExam: {
@@ -188,6 +190,7 @@ class HttpConfig {
             infoByCode: "/machine/getMachineByQrCode", // 首页根据二维码查询设备信息
         },
     };
+
 }
 
 export default new HttpConfig();
diff --git a/pages.json b/pages.json
index d193469..2227327 100644
--- a/pages.json
+++ b/pages.json
@@ -245,6 +245,12 @@
                 "navigationBarTitleText": "退料物料选择"
             }
         },
+        {
+            "path": "pages/exitMaterialSelect/exitMaterialSelectEdit",
+            "style": {
+                "navigationBarTitleText": "退料物料选择"
+            }
+        },
         {
             "path": "pages/exitExamDetail/exitExamDetail",
             "style": {
diff --git a/pages/backMaterialReceive/backMaterialReceive.vue b/pages/backMaterialReceive/backMaterialReceive.vue
index 4bfda4a..2996a57 100644
--- a/pages/backMaterialReceive/backMaterialReceive.vue
+++ b/pages/backMaterialReceive/backMaterialReceive.vue
@@ -12,8 +12,8 @@
                 class="single-fetch"
                 v-for="(fetch, index) in fetchMaterialList"
                 :key="index"
-                :right-options="fetch.taskStatus== '139' ? optionsTwo:options"
-                @click="optionClick($event, fetch.id, fetch.modelId,fetch.agreementId)">
+                :right-options="fetch.taskStatus === '139' ? optionsTwo : fetch.taskStatus === '39' ? optionsThree : options"
+                @click="optionClick($event, fetch.id, fetch.modelId,fetch.agreementId,fetch.taskStatus,fetch.taskId)">
                 <view class="fetch-upper">
                     <!-- {{ fetch.taskStatus }} -->
                     <!-- <checkbox-group 
@@ -217,6 +217,20 @@
                     },
                 ],
                 optionsTwo: [
+                    {
+                        text: "查看",
+                        style: {
+                            backgroundColor: "#007aff",
+                        },
+                    },
+                    {
+                        text: "新增",
+                        style: {
+                            backgroundColor: "#E6A23C",
+                        },
+                    },
+                ],
+                optionsThree: [
                     {
                         text: "查看",
                         style: {
@@ -342,16 +356,20 @@
                         console.log(err);
                     });
             },
-            optionClick(e, id, modelId,agreeId) {
+            optionClick(e, id, modelId,agreeId,status,taskId) {
                
                 console.log(id, modelId, "modelId");
                 if(e.index==0){
                 uni.navigateTo({
                     url: `/pages/seeBackMaterialDetail/seeBackMaterialDetail?id=${id}&typeId=${modelId}`,
                 });
+                }else if(e.index==1 && status=="139"){
+                	uni.navigateTo({
+                    url: `/pages/exitMaterialSelect/exitMaterialSelect?agreeId=${agreeId}&id=${id}`,
+                });
                 }else{
                 uni.navigateTo({
-                    url: `/pages/exitMaterialSelect/exitMaterialSelect?agreeId=${agreeId}&id=${id}`,
+                    url: `/pages/exitMaterialSelect/exitMaterialSelectEdit?taskId=${taskId}&id=${id}&agreementId=${agreeId}`,
                 });
                 }
             },
diff --git a/pages/exitMaterialSelect/exitMaterialSelect.vue b/pages/exitMaterialSelect/exitMaterialSelect.vue
index 8bb69f9..9dfc856 100644
--- a/pages/exitMaterialSelect/exitMaterialSelect.vue
+++ b/pages/exitMaterialSelect/exitMaterialSelect.vue
@@ -248,6 +248,7 @@
             that.$api.exitMaterial
                 .selectMaterial({
                     agreementId: params.agreeId,
+                    id: params.id,
                 })
                 .then((res) => {
                     console.log("数据获取成功！！！", res);
diff --git a/pages/exitMaterialSelect/exitMaterialSelectEdit.vue b/pages/exitMaterialSelect/exitMaterialSelectEdit.vue
new file mode 100644
index 0000000..c28a952
--- /dev/null
+++ b/pages/exitMaterialSelect/exitMaterialSelectEdit.vue
@@ -0,0 +1,448 @@
+<template>
+    <view>
+        <view class="search-bar">
+            <uni-easyinput
+                prefixIcon="search"
+                v-model="inputs"
+                placeholder="请输入名称"></uni-easyinput>
+        </view>
+        <view class="dataInfo">
+            <view
+                class="dataList"
+                v-for="(item, index) in searchData"
+                :key="index">
+                <checkbox-group @change="checkClick(item)">
+                    <checkbox :checked="item.checked" />
+                </checkbox-group>
+                <view class="details">
+                    <!-- <view class="img">
+						<image :src="item.url"></image>
+					</view> -->
+                    <view class="text">
+                        <text>类型名称：{{ item.typeName }}</text>
+                        <text>规格编号：{{ item.typeCode }}</text>
+                        <text>当前在用量：{{ item.useNum }}</text>
+                        <view
+                            >退料数量：<uni-easyinput
+                                style="margin-top: 15rpx"
+                                v-model="item.num"
+                                placeholder="请输入"
+                                @change="exitNumChange($event, index)"
+                                type="number"></uni-easyinput
+                        ></view>
+                    </view>
+                </view>
+                <!-- <view class="action">
+					<text @click="reduce(item)">-</text>
+					<text>{{item.offNum}}</text>
+					<text @click="add(item)">+</text>
+				</view> -->
+            </view>
+        </view>
+        <view class="buy" style="background-color: #fff">
+            <view class="checked">
+                <checkbox-group @tap="checkAll">
+                    <checkbox :checked="allChecked" />
+                </checkbox-group>
+                <text>全选</text>
+            </view>
+            <view class="total">
+                <!-- {{ totalNum }} -->
+                <view class="bill" @click="finishCart">
+                    <text>提交</text>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    import { basePath } from "../../public";
+    export default {
+        data() {
+            return {
+                iptVal: "",
+                allChecked: false,
+                inputs: "",
+                list: [],
+                totalFine: "",
+                cartList: [],
+                agreementId: "",
+                submitList: {
+                agreementId: "",
+                id: "",
+				companyId:101,
+                backApplyDetails: "",
+                companyId:101,
+                backApplyInfo: {}
+                },
+                backInfo: {},
+            };
+        },
+        computed: {
+            totalNum() {
+                //总计
+                var str = 0;
+                for (var i = 0; i < this.searchData.length; i++) {
+                    if (this.searchData[i].checked) {
+                        str += this.searchData[i].num;
+                    }
+                }
+                this.totalFine = str;
+                return str;
+            },
+            searchData: function () {
+                //模糊查询
+                if (!this.inputs) {
+                    return this.list;
+                }
+                return this.list.filter((item) => {
+                    return item.typeName.includes(this.inputs);
+                });
+            },
+        },
+        methods: {
+            iconClick() {
+                console.log(this.iptVal);
+            },
+            add(item) {
+                //加加
+                let num = item.offNum;
+                /* if (num >= item.num) {
+					uni.showToast({
+						icon: 'none',
+						title: '退料数量不可大于当前在用量！'
+					})
+				} else { */
+                item.offNum = num + 1;
+                // }
+            },
+            reduce(item) {
+                //减减
+                let num = item.offNum;
+                if (num > 1) {
+                    num -= 1;
+                } else if ((num = 1)) {
+                    uni.showToast({
+                        icon: "none",
+                        title: "该器具无法再减少",
+                    });
+                }
+                item.offNum = num;
+            },
+            // 单个商品的选择
+            checkClick(item) {
+                item.checked = !item.checked;
+                if (!item.checked) {
+                    this.allChecked = false;
+                } else {
+                    // 判断每一个商品是否是被选择的状态
+                    const goods = this.list.every((item) => {
+                        return item.checked === true;
+                    });
+                    if (goods) {
+                        this.allChecked = true;
+                    } else {
+                        this.allChecked = false;
+                    }
+                }
+            },
+            checkAll() {
+                this.allChecked = !this.allChecked;
+                if (this.allChecked) {
+                    this.list.map((item) => {
+                        item.checked = true;
+                    });
+                } else {
+                    this.list.map((item) => {
+                        item.checked = false;
+                    });
+                }
+            },
+            finishCart() {
+                let that = this;
+                that.cartList = that.list.filter((item) => {
+                    return item.checked == true && item.num > 0;
+                });
+				console.log(1111111111111);
+                console.log(that.cartList);
+				
+                if (that.cartList.length == 0) {
+                    uni.showToast({
+                        icon: "none",
+                        title: "请选择退料数量大于0的退料项！",
+                    });
+                } else {
+                    uni.showModal({
+                        title: "退料选择",
+                        content: "确认提交吗？",
+                        confirmText: "提交",
+                        success: (modalRes) => {
+                            if (modalRes.confirm) {
+                                console.log(this.cartList)
+                                that.submitList.backApplyDetails =
+                                    that.cartList.map((item) => {
+                                        return {
+                                            typeId: item["typeId"],
+                                            typeName: item["typeName"],
+                                            num: item["num"],
+                                        
+                                        };
+                                    });
+								console.log(33333333333);
+                                console.log(that.submitList);
+                                // 提交退料清单
+                                that.$api.exitMaterial
+                                    .subExitMaterialEdit(that.submitList)
+                                    .then((res) => {
+                                        console.log(res);
+                                        if (res.data.code == 200) {
+                                            uni.showToast({
+                                                icon: "none",
+                                                title: res.data.msg,
+                                                success: () => {
+                                                    uni.navigateBack();
+                                                },
+                                            });
+                                        } else {
+                                            uni.showToast({
+                                                icon: "none",
+                                                title: res.data.msg,
+                                            });
+                                        }
+                                    })
+                                    .catch((err) => {
+                                        console.log(err);
+                                    });
+                            }
+                        },
+                    });
+                }
+            },
+            exitNumChange(e, index) {
+                let that = this;
+                let numTest = /^\+?[1-9]\d*$/;
+                console.log(e, that.list[index].num);
+                if (!numTest.test(e)) {
+                    uni.showToast({
+                        icon: "none",
+                        title: "退料数量输入有误！",
+                        success: () => {
+                            that.list[index].num = 0;
+                        },
+                    });
+                } else if (e > that.list[index].useNum) {
+                    uni.showToast({
+                        icon: "none",
+                        title: "退料数量不得大于当前在用量！",
+                        success: () => {
+                            that.list[index].num = 0;
+                        },
+                    });
+                }
+            },
+        },
+        onLoad(params) {
+            let that = this;
+            console.log(params);
+            // that.agreementId = params.agreeId;
+            that.submitList.id = params.id;
+            that.submitList.agreementId = params.agreeId;
+            // 退料物料选择
+            that.$api.exitMaterial
+                .selectMaterialEdit({
+                    // agreementId: params.agreeId,
+                    // id: params.id,
+                    taskId:params.taskId
+                })
+                .then((res) => {
+                    console.log("数据获取成功！！！", res);
+                    if (res.data.code == 200) {
+                        if (res.data.data.backApplyDetails.length == 0) {
+                            uni.showToast({
+                                icon: "none",
+                                title: "当前物料已退完，请重新领料！",
+                            });
+                        } else {
+                            // for (let i = 0; i < res.data.data.backApplyDetails.length; i++) {
+                            //     // res.data.data[i].num = Number(
+                            //     //     res.data.data[i].num.split(".")[0]
+                            //     // );
+                            //     // res.data.data[i].offNum = 0;
+                            // }
+                            console.log(res);
+                            that.list = res.data.data.backApplyDetails;
+                            that.submitList.backApplyInfo = res.data.data.backApplyInfo;
+                        }
+                    }
+                })
+                .catch((err) => {
+                    console.log(err);
+                });
+        },
+    };
+</script>
+
+<style>
+    body {
+        box-sizing: border-box;
+        padding-bottom: 10vh;
+    }
+
+    .search-bar {
+        width: 95%;
+        margin: 20rpx auto;
+    }
+
+    /deep/uni-checkbox .uni-checkbox-input {
+        border-radius: 50%;
+    }
+
+    /deep/uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked {
+        border-color: #ddd;
+        color: #fff !important;
+        background-color: #2dcf8c !important;
+    }
+
+    /deep/uni-checkbox .uni-checkbox-input {
+        border-color: #ddd;
+    }
+
+    /deep/uni-checkbox .uni-checkbox-input:hover {
+        border-color: #ddd;
+    }
+
+    .search {
+        padding-top: 20rpx;
+    }
+
+    .search .searchIput {
+        background-color: #e6e6e6;
+        width: 95%;
+        margin: 0 auto;
+        height: 72rpx;
+        line-height: 72rpx;
+        border-radius: 50rpx;
+        padding: 0 32rpx;
+        box-sizing: border-box;
+        display: flex;
+        align-items: center;
+    }
+
+    .search .searchIput input {
+        font-size: 26rpx;
+        width: 100%;
+        color: grey;
+    }
+
+    .search .searchIput image {
+        width: 34rpx;
+        height: 34rpx;
+    }
+
+    .dataInfo {
+        width: 95%;
+        margin: 0 auto;
+    }
+
+    .dataInfo .dataList {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        border-bottom: 2px solid #f1f1f1;
+        padding: 25rpx 0;
+    }
+
+    .dataInfo .dataList .details {
+        display: flex;
+        align-items: center;
+        flex: 1;
+        font-size: 0;
+    }
+
+    .dataInfo .dataList .details .img image {
+        width: 200rpx;
+        height: 140rpx;
+        padding: 0 20rpx;
+    }
+
+    .dataInfo .dataList .details .text text {
+        color: #000;
+        font-size: 23rpx;
+        display: block;
+        padding: 10rpx 0;
+    }
+
+    .dataInfo .dataList .details .text {
+        color: red;
+        font-size: 25rpx;
+    }
+
+    .dataInfo .dataList .action text {
+        font-size: 25rpx;
+        color: #000;
+        border: 1px solid #c8c7cc;
+        display: inline-block;
+        line-height: 50rpx;
+        width: 60rpx;
+        text-align: center;
+        box-sizing: border-box;
+    }
+
+    .dataInfo .dataList .action text:nth-child(2) {
+        border-left: none;
+        border-right: none;
+    }
+
+    .buy {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        position: fixed;
+        left: 50%;
+        bottom: 0;
+        width: 95%;
+        transform: translate(-50%, 0);
+    }
+
+    .buy .checked {
+        display: flex;
+        align-items: center;
+    }
+
+    .buy .checked text {
+        font-size: 25rpx;
+        color: #000;
+        padding: 0 12rpx;
+    }
+
+    .buy .total {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+
+    .buy .total .price {
+        padding-right: 20rpx;
+    }
+
+    .buy .total .price text {
+        font-size: 27rpx;
+        color: #c8c7cc;
+        display: inline-block;
+    }
+
+    .buy .total .price text:last-child {
+        color: red;
+        font-weight: bold;
+    }
+
+    .buy .total .bill text {
+        font-size: 25rpx;
+        color: #fff;
+        display: inline-block;
+        background-color: red;
+        line-height: 70rpx;
+        width: 150rpx;
+        text-align: center;
+    }
+</style>
diff --git a/router.js b/router.js
index d2c4791..6b8776e 100644
--- a/router.js
+++ b/router.js
@@ -217,6 +217,13 @@ const router = createRouter({
                 needAuth: "true",
             },
         },
+        {
+            path: "/pages/exitMaterialSelect/exitMaterialSelectEdit",
+            name: "exitMaterialSelect",
+            meta: {
+                needAuth: "true",
+            },
+        },
         {
             path: "/pages/exitExamDetail/exitExamDetail",
             name: "exitExamDetail",