Merge remote-tracking branch 'origin/dev-nx' into dev-nx

sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue

@@ -142,6 +142,12 @@
                     <span v-if="scope.row.sltStatus == '3'">已审核</span>
                 </template>
             </el-table-column>
+            <el-table-column
+                label="备注"
+                align="center"
+                prop="remark"
+                :show-overflow-tooltip="true"
+            />
             <!-- <el-table-column label="租赁期限(天)" align="center" prop="leaseDay" :show-overflow-tooltip="true" />
       <el-table-column label="授权人" align="center" prop="authPerson" :show-overflow-tooltip="true" />
       <el-table-column label="联系电话 " align="center" prop="phone" :show-overflow-tooltip="true" />

sgzb-ui/src/views/cost/csotSettlement/costExame.vue

@@ -509,11 +509,14 @@ export default {
             deptName: undefined,
             applyVisible: false,
             applyList: [],
+            rowData: [],
         }
     },
     created() {
         this.Id = this.$route.query.Id
         this.getDataAll()
+        let arr = JSON.parse(this.$route.query.rowData)
+        this.rowData = arr
         //   this.getUnitList();
         //   this.getProjectList();
     },

sgzb-ui/src/views/cost/csotSettlement/costList.vue

@@ -324,10 +324,12 @@ export default {
         },
         //结算审核
         handleExame(row) {
+            let arr = [row]
             this.$tab.closeOpenPage({
                 path: '/cost/cost/costExame',
                 query: {
                     Id: row.id,
+                    rowData: JSON.stringify(arr),
                 },
             })
         },

sgzb-ui/vue.config.js

@@ -43,9 +43,9 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://192.168.2.134:28080`, //超
+        target: `http://192.168.2.154:28080`, //超
         // target: `http://10.40.92.81:28080`, //韩/
-        target: `http://192.168.2.82:28080`,//旭/
+        // target: `http://192.168.2.82:28080`,//旭/
         // target: `http://192.168.2.248:28080`, //帅
         // target: `http://192.168.2.209:28080`, //福
         // target: `http://192.168.2.114:39080`, //王