Merge branch 'main' into macode20240818

2024-08-19 17:35:20 +08:00 · 2024-08-19 17:35:20 +08:00 · cb08ca2da5
parent b7b196d06b 9bfcacb4df
commit cb08ca2da5
5 changed files with 156 additions and 150 deletions
--- a/src/views/claimAndRefund/secondStore/secondStore.vue
+++ b/src/views/claimAndRefund/secondStore/secondStore.vue
@ -1,21 +1,12 @@
 <template>
    <div class="app-container" id="secondStore">
-        <div
-          class="upper-sec"
-        >
-          <div
-            :class="[{ clicked: leaseType == 1 }]"
-            @click="toggleBtn(1)"
-          >
-            长期领用
-          </div>
-          <div
-            :class="[{ clicked: leaseType == 0 }]"
-            @click="toggleBtn(0)"
-
-          >
-            工程领用
-          </div>
+        <div class="upper-sec">
+            <div :class="[{ clicked: leaseType == 1 }]" @click="toggleBtn(1)">
+                长期领用
+            </div>
+            <div :class="[{ clicked: leaseType == 0 }]" @click="toggleBtn(0)">
+                工程领用
+            </div>
        </div>
        <el-form
            :model="queryParams"
@ -166,7 +157,6 @@
                label="工程名称"
                align="center"
                key="3"
-
                prop="proName"
                :show-overflow-tooltip="true"
                v-if="leaseType == 0"
@ -175,49 +165,43 @@
                label="类型名称"
                align="center"
                key="4"
-
                prop="typeName"
                :show-overflow-tooltip="true"
            />
            <el-table-column
-              label="规格型号"
-              align="center"
-              key="5"
-
-              prop="modelName"
-              :show-overflow-tooltip="true"
+                label="规格型号"
+                align="center"
+                key="5"
+                prop="modelName"
+                :show-overflow-tooltip="true"
            />
            <el-table-column
-              label="计量单位"
-              align="center"
-              key="6"
-
-              prop="nuitName"
-              :show-overflow-tooltip="true"
+                label="计量单位"
+                align="center"
+                key="6"
+                prop="nuitName"
+                :show-overflow-tooltip="true"
            />
            <el-table-column
-              label="总量"
-              align="center"
-              key="7"
-
-              prop="num"
-              :show-overflow-tooltip="true"
-              v-if="leaseType == 1"
+                label="总量"
+                align="center"
+                key="7"
+                prop="num"
+                :show-overflow-tooltip="true"
+                v-if="leaseType == 1"
            />
            <el-table-column
-              label="库存数量"
-              align="center"
-              key="8"
-
-              prop="stockNum"
-              :show-overflow-tooltip="true"
-              v-if="leaseType == 1"
+                label="库存数量"
+                align="center"
+                key="8"
+                prop="stockNum"
+                :show-overflow-tooltip="true"
+                v-if="leaseType == 1"
            />
            <el-table-column
                label="领用数量"
                align="center"
                key="9"
-
                prop="receiveNum"
                :show-overflow-tooltip="true"
                v-if="leaseType == 1"
@ -231,21 +215,19 @@
                </template>
            </el-table-column>
            <el-table-column
-              label="在用数量"
-              align="center"
-              key="10"
-
-              prop="receiveNum"
-              :show-overflow-tooltip="true"
-              v-if="leaseType == 0"
+                label="在用数量"
+                align="center"
+                key="10"
+                prop="receiveNum"
+                :show-overflow-tooltip="true"
+                v-if="leaseType == 0"
            />
            <el-table-column
-              label="操作"
-              align="center"
-              key="11"
-
-              width="150"
-              v-if="leaseType == 1"
+                label="操作"
+                align="center"
+                key="11"
+                width="150"
+                v-if="leaseType == 1"
            >
                <template slot-scope="scope">
                    <el-button
@ -273,11 +255,10 @@
        </el-table>

        <pagination
-            v-show="total > 0"
            :total="total"
            :page.sync="queryParams.pageNum"
            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
+            @pagination="getList(leaseType)"
        />

        <!-- 出库弹窗 -->
@ -318,9 +299,9 @@

                <el-form-item label="出库数量" prop="outNum">
                    <el-input
-                      v-model="form.outNum"
-                      placeholder="请输入出库数量"
-                      maxlength="20"
+                        v-model="form.outNum"
+                        placeholder="请输入出库数量"
+                        maxlength="20"
                    />
                </el-form-item>
                <el-form-item label="班组名称" prop="teamName">
@ -383,12 +364,9 @@
                    />
                </el-form-item>
                <el-form-item label="领用数量" prop="ckNum">
-                  <el-input
-                    v-model="nform.ckNum"
-                    disabled
-                  />
+                    <el-input v-model="nform.ckNum" disabled />
                </el-form-item>
-<!--                <el-form-item label="已出库数量" prop="ckNum">
+                <!--                <el-form-item label="已出库数量" prop="ckNum">
                    <el-input v-model="nform.ckNum" disabled />
                </el-form-item>-->

@ -437,7 +415,7 @@
            width="1200px"
            append-to-body
        >
-<!--            <el-form
+            <!--            <el-form
                :model="dialogQuery"
                ref="dialogQuery"
                size="small"
@ -482,7 +460,12 @@
                    align="center"
                    width="80"
                    type="index"
-                    :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)"
+                    :index="
+                        indexContinuation(
+                            dialogQuery.pageNum,
+                            dialogQuery.pageSize,
+                        )
+                    "
                >
                    <!-- <template slot-scope="scope">
                        <span>{{
@ -521,10 +504,10 @@
                    :show-overflow-tooltip="true"
                />
                <el-table-column
-                  label="出库时间"
-                  align="center"
-                  prop="outTime"
-                  :show-overflow-tooltip="true"
+                    label="出库时间"
+                    align="center"
+                    prop="outTime"
+                    :show-overflow-tooltip="true"
                />
            </el-table>

@ -613,7 +596,7 @@ export default {
                            }
                        },
                        trigger: 'blur',
-                    }
+                    },
                ],
                teamName: [
                    {
@ -641,7 +624,7 @@ export default {
                            }
                        },
                        trigger: 'blur',
-                    }
+                    },
                ],
                teamName: [
                    {
@ -675,9 +658,9 @@ export default {
    },
    methods: {
        // 按钮状态改变
-        toggleBtn (count) {
-          this.leaseType = count;
-          this.getList(this.leaseType);
+        toggleBtn(count) {
+            this.leaseType = count
+            this.getList(this.leaseType)
        },
        //获取单位
        getUnitList() {
@ -728,7 +711,7 @@ export default {
        /** 查询列表 */
        getList(leaseType) {
            this.loading = true
-            this.queryParams.leaseType = leaseType;
+            this.queryParams.leaseType = leaseType
            secondaryWarehouseList(this.queryParams).then((response) => {
                this.deviceList = response.rows
                this.total = response.total
@ -750,7 +733,7 @@ export default {
        },
        /** 搜索按钮操作 */
        handleQuery() {
-            this.queryParams.pageNum = 1
+            // this.queryParams.pageNum = 1
            this.getList(this.leaseType)
        },
        handleDialogQuery() {
@ -815,7 +798,8 @@ export default {
                this.$refs['form'].validate((valid) => {
                    if (valid) {
                        if (
-                            parseInt(this.form.outNum) > parseInt(this.form.zkNum)
+                            parseInt(this.form.outNum) >
+                            parseInt(this.form.zkNum)
                        ) {
                            this.$message.error('出库数量不可大于在库数量')
                            return
@ -892,29 +876,29 @@ export default {
    width: 60px !important;
    margin-bottom: 10px;
 }
-.upper-sec{
-  display: flex;
-  margin-bottom: 15px;
-  div{
-    box-sizing: border-box;
-    padding: 10px 30px;
-    background-color: #fff;
-    color: #999999;
-    font-size: 14px;
-    cursor: pointer;
-  }
-  div:first-child{
-    border-bottom-left-radius: 3px;
-    border-top-left-radius: 3px;
-  }
-  div:last-child{
-    border-top-right-radius: 3px;
-    border-bottom-right-radius: 3px;
-  }
-  .clicked{
-    background-color: #409EFF;
-    color: #fff;
-  }
+.upper-sec {
+    display: flex;
+    margin-bottom: 15px;
+    div {
+        box-sizing: border-box;
+        padding: 10px 30px;
+        background-color: #fff;
+        color: #999999;
+        font-size: 14px;
+        cursor: pointer;
+    }
+    div:first-child {
+        border-bottom-left-radius: 3px;
+        border-top-left-radius: 3px;
+    }
+    div:last-child {
+        border-top-right-radius: 3px;
+        border-bottom-right-radius: 3px;
+    }
+    .clicked {
+        background-color: #409eff;
+        color: #fff;
+    }
 }
 .clickText {
    color: #02a7f0;
--- a/src/views/claimAndreturn/return/receive/component/handlePage.vue
+++ b/src/views/claimAndreturn/return/receive/component/handlePage.vue
@ -88,7 +88,9 @@
                align="center"
                width="80"
                type="index"
-                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
+                :index="
+                    indexContinuation(queryParams.pageNum, queryParams.pageSize)
+                "
            >
                <!-- <template slot-scope="scope">
                    <span>{{
@ -202,7 +204,8 @@
                        v-if="
                            !isView &&
                            scope.row.manageType == '0' &&
-                            scope.row.num > 0
+                            scope.row.num > 0 &&
+                            (userId == scope.row.userId || userId == 1)
                        "
                    >
                        编码退料
@ -215,7 +218,8 @@
                            !isView &&
                            (scope.row.manageType == '1' ||
                                scope.row.manageType == '2') &&
-                            scope.row.num > 0
+                            scope.row.num > 0 &&
+                            (userId == scope.row.userId || userId == 1)
                        "
                    >
                        数量退料
@ -224,7 +228,11 @@
                        size="mini"
                        icon="el-icon-zoom-in"
                        @click="handleBackup(scope.row)"
-                        v-if="!isView && scope.row.num < scope.row.preNum"
+                        v-if="
+                            !isView &&
+                            scope.row.num < scope.row.preNum &&
+                            (userId == scope.row.userId || userId == 1)
+                        "
                    >
                        撤回
                    </el-button>
@ -318,7 +326,9 @@
                    align="center"
                    width="80"
                    type="index"
-                    :index="indexContinuation(codeQuery.pageNum, codeQuery.pageSize)"
+                    :index="
+                        indexContinuation(codeQuery.pageNum, codeQuery.pageSize)
+                    "
                >
                    <!-- <template slot-scope="scope">
                        <span>{{
@ -682,6 +692,7 @@ export default {
            codeTotal: 0, //编码弹窗分页-总数
            codeList: [], //编码弹窗表格数据
            numList: [], //数量弹窗表格数据
+            userId: sessionStorage.getItem('userId'),
        }
    },
    mounted() {
--- a/src/views/cost/csotSettlement/costApplyList.vue
+++ b/src/views/cost/csotSettlement/costApplyList.vue
@ -333,7 +333,7 @@ export default {
        /** 批量导出月结明细表 */
        handleBatchExport() {
            console.log('批量导出月结明细表')
-
+            this.exportParams = []
            if (this.ids.length < 1) {
                this.$message.error('请勾选需要导出的数据！')
                return
@ -348,7 +348,6 @@ export default {
            })

            this.exportDialogVisible = true
-            this.$refs.tableRef.clearSelection()
        },
        /** 关闭弹框 */
        handleCloseDialog() {
@ -369,6 +368,7 @@ export default {
            )

            this.exportDialogVisible = false
+            this.$refs.tableRef.clearSelection()
        },
        /** 月结记录 */
        handleMonthRecord(row) {
--- a/src/views/warehouseManage/warehousing/newTools/index.vue
+++ b/src/views/warehouseManage/warehousing/newTools/index.vue
@ -276,13 +276,18 @@
                <!--          >导出</el-button>-->
                <!--        </el-col>-->
            </el-row>
-            <el-table v-loading="loading" :data="detailTableList" border>
-                <!-- <el-table-column
+            <el-table
+                v-loading="loading"
+                :data="detailTableList"
+                border
+                @selection-change="handleSelectionChange"
+            >
+                <el-table-column
                    type="selection"
                    width="55"
                    align="center"
                    :selectable="selectable"
-                /> -->
+                />
                <el-table-column
                    label="序号"
                    align="center"
@ -729,42 +734,48 @@ export default {
            })
        },
        passAll() {
-            const params = {
-                pageNum: 1,
-                pageSize: 9999,
-                taskId: this.query.taskId,
-                dictName: this.query.dictName,
+            // const params = {
+            //     pageNum: 1,
+            //     pageSize: 9999,
+            //     taskId: this.query.taskId,
+            //     dictName: this.query.dictName,
+            // }
+
+            if (this.ids.length < 1) {
+                this.$message.error('请勾选需要入库的数据！')
+                return
            }

-            this.passLoading = true
-            getPutinDetailsList(params).then((res) => {
-                let deviceList = res.rows
-                deviceList.forEach((item) => {
-                    item.taskId = this.query.taskId
-                    item.typeId = item.typeId
-                    item.maId = item.maId
-                    item.inputNum = item.checkNum
-                    item.maCode = item.maCode
-                })
-                let param = {
-                    taskId: this.query.taskId,
-                    checkResult: '1',
-                    inputRecordList: deviceList,
-                }
-                changePutinStatus(param)
-                    .then((response) => {
-                        if (response.code == 200) {
-                            this.$modal.msgSuccess('审批成功')
-                            this.getDialogTable()
-                            this.getList()
-                        } else {
-                            this.$modal.msgSuccess('审批失败')
-                        }
-                    })
-                    .finally(() => {
-                        this.passLoading = false
-                    })
+            this.ids.forEach((item) => {
+                item.taskId = this.query.taskId
+                item.typeId = item.typeId
+                item.maId = item.maId
+                item.inputNum = item.checkNum
+                item.maCode = item.maCode
            })
+            let param = {
+                taskId: this.query.taskId,
+                checkResult: '1',
+                inputRecordList: this.ids,
+            }
+            this.passLoading = true
+            changePutinStatus(param)
+                .then((response) => {
+                    if (response.code == 200) {
+                        this.$modal.msgSuccess('审批成功')
+                        this.getDialogTable()
+                        this.getList()
+                    } else {
+                        this.$modal.msgSuccess('审批失败')
+                    }
+                })
+                .finally(() => {
+                    this.passLoading = false
+                })
+            // getPutinDetailsList(params).then((res) => {
+            //     let deviceList = res.rows
+
+            // })
        },
        //拒绝
        refused(row) {
--- a/vue.config.js
+++ b/vue.config.js
@ -42,9 +42,9 @@ module.exports = {
        // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
        // target: `https://z.csgmall.com.cn`,

-        target: `http://192.168.2.141:39080`, //超
+        // target: `http://192.168.2.141:39080`, //超
        // target: `http://10.40.92.81:8080`, //韩/
-        // target: `http://10.40.92.74:8080`,//旭/
+        target: `http://192.168.2.77:39080`,//旭/
        // target: `http://10.40.92.138:28080`, //帅
        // target: `http://192.168.2.218:39080`, //福
        // target: `http://192.168.2.120:39080`, //跃