优化

sgzb-ui/src/views/scrapManage/forecastWaste/auditing.vue

@@ -262,6 +262,9 @@
                 if (res.code == 200) {
                     this.$message.success('审核通过！')
                     this.dialogVisible = false
+                } else {
+                    console.log('审核失败--')
+                    this.auditingParams.scrapDetailList = []
                 }
             },
             /* 审核驳回 */

sgzb-ui/src/views/scrapManage/forecastWaste/index.js

@@ -53,16 +53,15 @@ export const config = {
     /* 预报废列表主页 列表参数 */
     listingTableProps: [
         { t_width: '55px', t_props: '', t_label: '序号' },
-        { t_width: '', t_props: 'demo', t_label: '预报废单号' },
+        { t_width: '', t_props: 'scrapNum', t_label: '报废单号' },
         { t_width: '', t_props: '', t_label: '报废类型' },
-        { t_width: '', t_props: '', t_label: '预报废审核单号' },
+        { t_width: '', t_props: 'repairNum', t_label: '预报废单号' },
-        { t_width: '', t_props: '', t_label: '退料单位名称' },
+        { t_width: '', t_props: 'unitName', t_label: '退料单位名称' },
-        { t_width: '', t_props: '', t_label: '退料单位名称' },
+        { t_width: '', t_props: 'projectName', t_label: '退料工程名称' },
-        { t_width: '', t_props: '', t_label: '退料工程名称' },
+        { t_width: '', t_props: 'itemType', t_label: '机具类型' },
-        { t_width: '', t_props: '', t_label: '机具类型' },
+        { t_width: '', t_props: 'createBy', t_label: '任务创建人' },
-        { t_width: '', t_props: '', t_label: '任务创建人' },
+        { t_width: '', t_props: 'createTime', t_label: '任务创建时间' },
-        { t_width: '', t_props: '', t_label: '任务创建时间' },
+        { t_width: '', t_props: 'taskStatus', t_label: '审核状态', t_slot: 'type' },
-        { t_width: '', t_props: '', t_label: '审核状态' },
     ],
     /* 预报废列表主页表单 查询参数 */
     listingFormLabel: [

sgzb-ui/src/views/scrapManage/forecastWaste/listing.vue

@@ -9,7 +9,7 @@
                 :exportShow="true"
                 :pageShow="true"
                 :isSelShow="true"
-                :handleWidth="`260px`"
+                :handleWidth="`200px`"
                 @getTableSelectionChange="getTableSelectionChange"
             >
                 <template slot="submitScrap">
@@ -26,12 +26,54 @@
 
                 <template slot-scope="{ data }">
                     <el-button
-                        v-for="btn in handleBtn"
-                        :key="btn.id"
                         type="text"
                         size="mini"
-                        @click="handleBtnEvent(data, btn.id)"
+                        @click="handlePreview(data)"
-                        >{{ btn.btn_title }}</el-button
+                        >查看</el-button
+                    >
+                    <el-button
+                        type="text"
+                        size="mini"
+                        v-if="data.taskStatus == 124"
+                        @click="handleSubmitScrap(data)"
+                        >提交报废</el-button
+                    >
+                    <el-button
+                        type="text"
+                        size="mini"
+                        @click="handleAuditing(data)"
+                        >审批详情</el-button
+                    >
+                    <el-button
+                        type="text"
+                        size="mini"
+                        v-if="data.taskStatus == 61"
+                        @click="handleReject(data)"
+                        >驳回退料</el-button
+                    >
+                </template>
+
+                <template slot-scope="{ data }" slot="type">
+                    <el-tag size="mini" v-if="data.taskStatus == 124"
+                        >待提交</el-tag
+                    >
+                    <el-tag
+                        size="mini"
+                        type="warning"
+                        v-if="data.taskStatus == 58"
+                        >审核中</el-tag
+                    >
+                    <el-tag
+                        size="mini"
+                        type="danger"
+                        v-if="data.taskStatus == 61"
+                        >已驳回</el-tag
+                    >
+                    <el-tag
+                        size="mini"
+                        type="success"
+                        v-if="data.taskStatus == 59"
+                        >已通过</el-tag
                     >
                 </template>
             </TableModel>
@@ -44,7 +86,7 @@
                 @closeDialog="closeDialog"
             >
                 <!-- 查看内容 -->
-                <template slot="preview" v-if="previewDetails">
+                <template slot="preview" v-if="title === '查看'">
                     <TableModel
                         :tableProps="config.previewTableProps"
                         :handleColShow="false"
@@ -54,7 +96,7 @@
                 ></template>
 
                 <!-- 审批详情 -->
-                <template v-if="auditingShow">
+                <template v-if="title === '审批详情'">
                     <el-table :data="audDetails">
                         <el-table-column
                             prop="title"
@@ -71,7 +113,7 @@
                 </template>
 
                 <!-- 部门选择 -->
-                <template v-if="selDepart">
+                <template v-if="title === '提交报废'">
                     <SelDepart @closeDepartSel="closeDepartSel" />
                 </template>
             </DialogModel>
@@ -109,8 +151,7 @@
                 title: '',
                 dialogWidth: '70%',
                 dialogVisible: false,
-                previewDetails: false,
+
-                auditingShow: false,
                 selDepart: false,
                 tableSelList: [],
                 audDetails: [
@@ -129,30 +170,47 @@
         },
         methods: {
             /* 列表按钮操作 */
-            handleBtnEvent(val, id) {
+
-                switch (id) {
+            handlePreview(row) {
-                    case 1:
                 this.title = '查看'
                 this.dialogWidth = '70%'
-                        this.previewDetails = true
-                        break
-                    case 2:
-                        this.title = '提交报废'
-                        this.dialogWidth = '50%'
-                        this.selDepart = true
-                        break
-                    case 3:
-                        this.title = '审批详情'
-                        this.dialogWidth = '50%'
-                        this.auditingShow = true
-                        break
-                    case 4:
-                        this.temp = !this.temp
-                        break
-                }
-
                 this.dialogVisible = true
             },
+            handleSubmitScrap(row) {
+                this.title = '提交报废'
+                this.dialogWidth = '50%'
+                this.dialogVisible = true
+            },
+            handleAuditing(row) {
+                this.title = '审批详情'
+                this.dialogWidth = '50%'
+                this.dialogVisible = true
+            },
+            handleReject(row) {
+                this.temp = !this.temp
+            },
+            // handleBtnEvent(val, id) {
+            //     switch (id) {
+            //         case 1:
+
+            //             this.previewDetails = true
+            //             break
+            //         case 2:
+            //             this.title = '提交报废'
+            //             this.dialogWidth = '50%'
+            //             this.selDepart = true
+            //             break
+            //         case 3:
+            //             this.title = '审批详情'
+            //             this.dialogWidth = '50%'
+            //             this.auditingShow = true
+            //             break
+            //         case 4:
+            //             this.temp = !this.temp
+            //             break
+            //     }
+
+            // },
 
             /* 关闭弹框 */
             closeDialog(val) {

sgzb-ui/vue.config.js

@@ -43,7 +43,7 @@ module.exports = {
         // target: `https://z.csgmall.com.cn`,
 
         target: `http://10.40.92.14:8080`, //福
-        // target: `http://10.40.92.8:8080`, //福
+        // target: `http://10.40.92.153:8080`, //马帅
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址;