From 25137a0fb4a516cc464d857f03478742e528dc64 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 29 Jul 2024 11:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndreturn/picking/outbound/index.vue | 16 +++++--
 .../return/apply/component/addReturn1.vue     | 15 ++++++-
 .../cost/csotSettlement/costApplyList.vue     | 45 ++++++++++++-------
 sgzb-ui/vue.config.js                         |  4 +-
 4 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
index 75088a6a..1612b05e 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
@@ -295,8 +295,7 @@
                             size="mini"
                             type="primary"
                             v-if="
-                                (scope.row.manageType == 1 ||
-                                    scope.row.manageType == 2) &&
+                                scope.row.manageType == 1 &&
                                 scope.row.status != 2
                             "
                             @click="numOut(scope.row)"
@@ -389,7 +388,9 @@
                     align="center"
                     width="80"
                     type="index"
-                    :index="indexContinuation(outQuery.pageNum, outQuery.pageSize)"
+                    :index="
+                        indexContinuation(outQuery.pageNum, outQuery.pageSize)
+                    "
                 >
                     <!-- <template slot-scope="scope">
                         <span>{{
@@ -591,7 +592,7 @@ export default {
             },
             numOutForm: {
                 //数量表单-车牌号
-                carCode: undefined,
+                carCode: '',
             },
             outQuery: {
                 //编码出库-搜索条件
@@ -602,6 +603,7 @@ export default {
             outTotal: 0, //编码弹窗分页-总数
             outCodeList: [], //编码弹窗表格数据
             outNumList: [], //数量弹窗表格数据
+            leaseType: '', // 领用类型 0 为工程租赁 1 为长期领用
         }
     },
     created() {
@@ -707,6 +709,7 @@ export default {
             this.openLeaseDevices = true
             this.isView = false
             this.dialogQuery.id = row.id
+            this.leaseType = row.leaseType
             this.resetDialogQuery()
             // this.getDialogList()
         },
@@ -785,9 +788,12 @@ export default {
                         parentId: this.outObj.parentId,
                         outNum: 1,
                         taskId: this.outObj.taskId,
+                        leaseType: this.leaseType,
                     }
                     return obj
                 })
+
+                // console.log(params, '编码出库时参数')
                 // console.log(params)
                 submitOut(params).then((response) => {
                     this.$modal.msgSuccess('出库成功')
@@ -802,7 +808,9 @@ export default {
         //数量出库保存
         saveNumOut() {
             this.outNumList[0].carCode = this.numOutForm.carCode
+            this.outNumList[0].leaseType = this.leaseType
             let param = this.outNumList
+            // console.log(param, '数量出库时参数')
             submitNumOut(param).then((response) => {
                 this.$modal.msgSuccess('出库成功')
                 this.openNum = false
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue
index 381f0def..00833740 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue
@@ -7,6 +7,7 @@
             :rules="queryRules"
             :inline="true"
             v-show="showSearch"
+            label-width="100px"
         >
             <el-row>
                 <el-form-item label="退料单位" prop="unitId">
@@ -51,6 +52,7 @@
                     <el-input
                         v-model="queryParams.agreementCode"
                         disabled
+                        style="width: 240px"
                     ></el-input>
                 </el-form-item>
                 <el-form-item label="物品类型" prop="status">
@@ -62,6 +64,7 @@
                         @change="deviceTypeChange"
                         ref="deviceTypeCascader"
                         filterable
+                        style="width: 240px"
                     ></el-cascader>
                 </el-form-item>
                 <el-form-item label="退料人" prop="backPerson">
@@ -70,6 +73,7 @@
                         placeholder="请输入退料人"
                         clearable
                         @keyup.enter.native="handleQuery"
+                        style="width: 240px"
                     />
                 </el-form-item>
                 <el-form-item label="退料时间" prop="backTime">
@@ -78,6 +82,7 @@
                         type="date"
                         value-format="yyyy-MM-dd"
                         placeholder="选择时间"
+                        style="width: 240px"
                     >
                     </el-date-picker>
                 </el-form-item>
@@ -493,7 +498,10 @@ export default {
         // }
         if (this.rejectId) {
             this.rowId = this.rejectId
-            this.GetViewByApply({ id: this.rejectId, agreementId: this.agreementId})
+            this.GetViewByApply({
+                id: this.rejectId,
+                agreementId: this.agreementId,
+            })
         }
         getInfo().then((res) => {
             this.companyId = res.user.companyId
@@ -559,7 +567,10 @@ export default {
 
         // 获取 任务详情数据
         async GetViewByApply(params) {
-            const res = await materialReturnNoteByApply({ id: params.id, agreementId: params.agreementId})
+            const res = await materialReturnNoteByApply({
+                id: params.id,
+                agreementId: params.agreementId,
+            })
             const data = res.data[0]
             // console.log(data)
             // this.queryParams.taskId = data.taskId
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
index 44d4d0b1..71205f73 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
@@ -80,7 +80,6 @@
             </el-form>
 
             <el-table
-                v-loading="loading"
                 :data="agreementList"
                 border
                 @selection-change="handleSelectionChange"
@@ -117,21 +116,29 @@
                     show-overflow-tooltip
                 />
                 <el-table-column
-                    label="合计费用"
+                    label="累计结算费用"
                     align="center"
                     prop="cost"
                     show-overflow-tooltip
                 />
-                <el-table-column
-                    label="结算状态"
-                    align="center"
-                    prop="sltStatus"
-                    show-overflow-tooltip
-                >
-                    <template slot-scope="scope">
-                        <span v-if="scope.row.sltStatus == '1'">未结算</span>
+                <el-table-column label="结算状态" align="center">
+                    <template slot-scope="{ row }">
+                        <!-- <span v-if="scope.row.sltStatus == '1'">未结算</span>
                         <span v-if="scope.row.sltStatus == '2'">已结算</span>
-                        <span v-if="scope.row.sltStatus == '3'">待审核</span>
+                        <span v-if="scope.row.sltStatus == '3'">待审核</span> -->
+                        <el-tag
+                            type="warning"
+                            size="mini"
+                            v-if="row.sltStatus == 1"
+                            >结算中</el-tag
+                        >
+                        <el-tag
+                            type="success"
+                            size="mini"
+                            style="margin-left: 8px"
+                            v-if="row.sltStatus == 2"
+                            >已结算</el-tag
+                        >
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center">
@@ -200,7 +207,7 @@ export default {
     data() {
         return {
             // 遮罩层
-            loading: true,
+            // loading: true,
             // 选中数组
             ids: [],
             // 非单个禁用
@@ -217,12 +224,15 @@ export default {
             projectList: [],
             statusList: [
                 { id: '0', name: '请选择' },
-                { id: '1', name: '未结算' },
+                { id: '1', name: '结算中' },
                 { id: '2', name: '已结算' },
-                { id: '3', name: '待审核' },
             ], //集合
             // 表格数据
-            agreementList: [],
+            agreementList: [
+                {
+                    agreementCode: '测试',
+                },
+            ],
             // 弹出层标题
             title: '',
             // 是否显示弹出层
@@ -320,6 +330,11 @@ export default {
         handleBatchExport() {
             console.log('批量导出月结明细表')
 
+            if (this.ids.length < 1) {
+                this.$message.error('请勾选需要导出的数据！')
+                return
+            }
+
             this.exportDialogVisible = true
         },
         /** 关闭弹框 */
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index ce3fccef..132a03ff 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -42,12 +42,12 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://192.168.2.167:28080`, //超
+        target: `http://192.168.2.134:39080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
         // target: `http://10.40.92.138:28080`, //帅
         // target: `http://10.40.92.253:28080`, //福
-        target: `http://192.168.2.120:39080`, //跃
+        // target: `http://192.168.2.120:39080`, //跃
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;