优化退料报废，以及相关页面

sgzb-ui/src/components/Description/index.vue

@@ -0,0 +1,75 @@
+<template>
+    <div>
+        <el-descriptions
+            class="margin-top"
+            :column="column"
+            size="medium"
+            border
+            :labelStyle="labelStyle"
+            :contentStyle="contentStyle"
+        >
+            <el-descriptions-item v-for="(item, v) in columnList" :key="v">
+                <template slot="label">{{ item.label }}</template>
+                <template v-if="item.v_slot">
+                    <slot
+                        :name="item.v_slot"
+                        :data="descriptionDetailsInfo[item.content] || {}"
+                    ></slot>
+                </template>
+                <template v-else>
+                    {{ descriptionDetailsInfo[item.content] || '-' }}
+                </template>
+            </el-descriptions-item>
+        </el-descriptions>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        // 展示几列
+        column: {
+            type: Number,
+            default: () => 3,
+        },
+        // label 样式
+        labelStyle: {
+            type: Object,
+            default: () => {
+                return {
+                    'text-align': 'center',
+                    width: '200px',
+                }
+            },
+        },
+        // 内容 样式
+        contentStyle: {
+            type: Object,
+            default: () => {
+                return {
+                    'text-align': 'center',
+                    width: '400px',
+                }
+            },
+        },
+        // label 列数据源
+        columnList: {
+            type: Array,
+            default: () => [],
+        },
+        // 查询的数据源
+        descriptionDetailsInfo: {
+            type: Object,
+            default: () => {
+                return {}
+            },
+        },
+    },
+}
+</script>
+
+<style scoped>
+.margin-top {
+    margin-top: -15px;
+}
+</style>

sgzb-ui/src/views/base/comeAndGo/index.vue

@@ -146,7 +146,7 @@
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['base:comeAndGo:edit']"
-                        >编辑</el-button
+                        >修改</el-button
                     >
                     <el-button
                         type="text"
@@ -203,7 +203,7 @@
                             :key="item.id"
                             :label="item.name"
                             :value="item.id"
-                            v-if="item.status != '1'"
+                            v-show="item.status != '1'"
                         ></el-option>
                     </el-select>
                 </el-form-item>

sgzb-ui/src/views/base/project/index.vue

@@ -130,16 +130,15 @@
             <el-table-column label="操作" align="center" width="140">
                 <template slot-scope="scope">
                     <el-button
-                        size="mini"
                         type="text"
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['base:project:edit']"
-                        >编辑</el-button
+                        >修改</el-button
                     >
                     <el-button
-                        size="mini"
                         type="text"
+                        style="color: #f56c6c"
                         icon="el-icon-delete"
                         @click="handleDelete(scope.row)"
                         v-hasPermi="['base:project:del']"

sgzb-ui/src/views/base/section/index.vue

@@ -134,16 +134,15 @@
             <el-table-column label="操作" align="center" width="140">
                 <template slot-scope="scope">
                     <el-button
-                        size="mini"
                         type="text"
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['base:section:edit']"
-                        >编辑</el-button
+                        >修改</el-button
                     >
                     <el-button
-                        size="mini"
                         type="text"
+                        style="color: #f56c6c"
                         icon="el-icon-delete"
                         @click="handleDelete(scope.row)"
                         v-hasPermi="['base:section:del']"
@@ -211,7 +210,7 @@
                             :key="item.id"
                             :label="item.name"
                             :value="item.id"
-                            v-if="item.status != '1'"
+                            v-show="item.status != '1'"
                         ></el-option>
                     </el-select>
                 </el-form-item>

sgzb-ui/src/views/claimAndreturn/return/scrap/component/config.js

@@ -54,8 +54,8 @@ export const dialogConfig = {
         // { t_width: '55px', t_props: '', t_label: '序号' },
         { t_width: '', t_props: 'typeName', t_label: '设备类型' },
         { t_width: '', t_props: 'typeCode', t_label: '规格型号' },
-        { t_width: '', t_props: 'maCode', t_label: '设备编码' },
+        // { t_width: '', t_props: 'maCode', t_label: '设备编码' },
-        { t_width: '', t_props: 'num', t_label: '数量', t_slot: 'num', },
+        { t_width: '', t_props: 'num', t_label: '退料数量', t_slot: 'num', },
         { t_width: '', t_props: 'remark', t_label: '驳回原因' },
     ],
 

sgzb-ui/src/views/claimAndreturn/return/scrap/component/home.vue

@@ -83,6 +83,7 @@ import { config, dialogConfig, getSelList } from './config.js'
 import {
     getBackReceiveList,
     getViewByApply,
+    getBackMachineNew,
 } from '@/api/claimAndRefund/return.js'
 export default {
     components: {
@@ -101,6 +102,7 @@ export default {
             dialogConfig,
             getSelList,
             getBackReceiveList,
+            // getBackMachineNew,
             getViewByApply,
             sendParams: {
                 backSource: 1,
@@ -110,6 +112,12 @@ export default {
                 id: '',
                 agreementId: '',
             },
+            // sendParamsQuery: {
+            //     parentId: '',
+            //     agreementId: '',
+            //     typeId:'',
+            //     taskId:''
+            // },
         }
     },
     created() {

sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js

@@ -89,7 +89,7 @@ export const dialogConfig = {
         { t_width: '', t_props: 'auditRemark', t_label: '驳回原因' },
         { t_width: '', t_props: '', t_label: '损坏原因', t_slot: 't_damage' },
         { t_width: '', t_props: '', t_label: '报废图片', t_slot: 't_img' },
-        { t_width: '', t_props: 'remark', t_label: '备注' },
+        // { t_width: '', t_props: 'remark', t_label: '备注' },
     ],
 
 }

sgzb-ui/src/views/warehouseManage/machinery/type/component/docView.vue

@@ -0,0 +1,33 @@
+<template>
+    <div>
+        <a :href="`${docViewUrl}${docUrl}`" target="_blank"> {{ docName }} </a>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        // 文档地址
+        docUrl: {
+            type: String,
+            default: () => '',
+        },
+        // 文档名称
+        docName: {
+            type: String,
+            default: () => '-',
+        },
+    },
+    data() {
+        return {
+            docViewUrl: process.env.VUE_APP_BASE_API + '/system',
+        }
+    },
+}
+</script>
+
+<style scoped>
+a {
+    color: #409eff;
+}
+</style>

sgzb-ui/src/views/warehouseManage/machinery/type/index.vue

@@ -107,28 +107,27 @@
                         align="center"
                     /> -->
                     <el-table-column
-                        label="名称"
+                        label="设备名称"
                         align="center"
                         key="typeName"
                         prop="typeName"
                         show-overflow-tooltip
                     />
-                    <el-table-column
+                    <!-- <el-table-column
                         label="计量单位"
                         align="center"
                         key="unitName"
                         prop="unitName"
                         show-overflow-tooltip
-                    />
+                    /> -->
                     <el-table-column
                         label="内部租赁价"
                         align="center"
                         key="leasePrice"
                         prop="leasePrice"
                         show-overflow-tooltip
-                        width="100"
                     />
-                    <el-table-column
+                    <!-- <el-table-column
                         label="原值"
                         align="center"
                         key="buyPrice"
@@ -141,7 +140,7 @@
                         key="payPrice"
                         prop="payPrice"
                         show-overflow-tooltip
-                    />
+                    /> -->
                     <el-table-column
                         label="库管员"
                         align="center"
@@ -168,7 +167,7 @@
                             </el-tag>
                         </template>
                     </el-table-column>
-                    <el-table-column
+                    <!-- <el-table-column
                         label="图片"
                         align="center"
                         key="photoName"
@@ -182,8 +181,8 @@
                                 >{{ scope.row.photoName }}</span
                             >
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
-                    <el-table-column
+                    <!-- <el-table-column
                         label="文档资料"
                         align="center"
                         key="documentName"
@@ -199,45 +198,44 @@
                                 {{ scope.row.documentName }}
                             </a>
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
-                    <el-table-column
+                    <!-- <el-table-column
                         label="资产属性"
                         align="center"
                         key="propName"
                         prop="propName"
                         show-overflow-tooltip
-                    />
+                    /> -->
-                    <el-table-column
+                    <!-- <el-table-column
                         label="厂家规格型号"
                         align="center"
                         key="facModel"
                         prop="facModel"
                         show-overflow-tooltip
-                    />
+                    /> -->
-                    <el-table-column
+                    <!-- <el-table-column
                         label="备注信息"
                         align="center"
                         key="remark"
                         prop="remark"
                         show-overflow-tooltip
-                    />
+                    /> -->
 
-                    <el-table-column label="操作" align="center" width="180">
+                    <el-table-column label="操作" align="center" width="280">
                         <template
                             slot-scope="scope"
                             v-if="scope.row.typeId !== 1"
                         >
                             <el-button
-                                size="mini"
                                 type="text"
-                                icon="el-icon-edit"
+                                icon="el-icon-setting"
+                                style="color: #e6a23c"
                                 @click="handleConfig(scope.row)"
                                 v-hasPermi="['machinery:type:config']"
                             >
                                 配置
                             </el-button>
                             <el-button
-                                size="mini"
                                 type="text"
                                 icon="el-icon-edit"
                                 @click="handleUpdate(scope.row)"
@@ -246,25 +244,34 @@
                                 修改
                             </el-button>
                             <el-button
-                                size="mini"
                                 type="text"
                                 icon="el-icon-delete"
+                                style="color: #f56c6c"
                                 @click="handleDelete(scope.row)"
                                 v-hasPermi="['machinery:type:del']"
                             >
                                 删除
                             </el-button>
+                            <el-button
+                                type="text"
+                                style="color: #67c23a"
+                                icon="el-icon-chat-dot-square"
+                                @click="handleDetails(scope.row)"
+                                v-hasPermi="['machinery:type:del']"
+                            >
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
 
-                <!-- <pagination
+                <pagination
-          v-show="total>0"
+                    v-show="total > 0"
-          :total="total"
+                    :total="total"
-          :page.sync="queryParams.pageNum"
+                    :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
+                    :limit.sync="queryParams.pageSize"
-          @pagination="getList"
+                    @pagination="getList"
-        />-->
+                />
             </el-col>
         </el-row>
 
@@ -573,6 +580,32 @@
                 <el-button @click="cancelConfig">取 消</el-button>
             </div>
         </el-dialog>
+
+        <!-- 详情 -->
+        <DialogModel
+            :dialogConfig="dialogConfig"
+            @closeDialogOuter="closeDialogOuter"
+        >
+            <template slot="outerContent">
+                <Description
+                    :columnList="columnList"
+                    :descriptionDetailsInfo="descriptionDetailsInfo"
+                >
+                    <template slot="img" slot-scope="{ data }">
+                        <ScrapImg v-if="data" :scrapImgUrl="data" />
+                        <template v-else> - </template>
+                    </template>
+                    <template slot="doc" slot-scope="{ data }">
+                        <DocView
+                            v-if="data"
+                            :docUrl="data"
+                            :docName="descriptionDetailsInfo.documentName || ''"
+                        />
+                        <template v-else> - </template>
+                    </template>
+                </Description>
+            </template>
+        </DialogModel>
     </div>
 </template>
 
@@ -591,10 +624,16 @@ import { getUserByRoleList, getMaUserList } from '@/api/system/user'
 import { getProLists } from '@/api/base/base'
 import { imgUpLoad, fileUpLoad } from '@/api/system/upload'
 import { getInfo } from '@/api/login'
+
+import DialogModel from '@/components/DialogModel'
+import Description from '@/components/Description/index'
+import ScrapImg from '@/views/scrapManage/component/scrapImg'
+import DocView from './component/docView.vue'
+
 export default {
     name: 'ToolsType',
     // dicts: ['sys_normal_disable', 'sys_user_sex'],
-    components: { Treeselect },
+    components: { Treeselect, Description, DialogModel, ScrapImg, DocView },
     data() {
         return {
             // 遮罩层
@@ -656,8 +695,8 @@ export default {
 
             // 查询参数
             queryParams: {
-                // pageNum: 1,
+                pageNum: 1,
-                // pageSize: 10,
+                pageSize: 10,
                 typeName: undefined,
                 // phonenumber: undefined,
                 // status: undefined,
@@ -748,6 +787,24 @@ export default {
                 //   {required: true, message: "开始日期不能为空", trigger: "blur"}
                 // ],
             },
+            // 设备详情对话框配置
+            dialogConfig: {
+                outerWidth: '70%',
+                outerTitle: '设备详情',
+                outerVisible: false,
+            },
+            // 详情展示列配置
+            columnList: [
+                { label: '计量单位', content: 'unitName' },
+                { label: '原值', content: 'buyPrice' },
+                { label: '丢失赔偿', content: 'payPrice' },
+                { label: '图片', content: 'photoUrl', v_slot: 'img' },
+                { label: '文档资料', content: 'documentName', v_slot: 'doc' },
+                { label: '资产属性', content: 'propName' },
+                { label: '厂家规格型号', content: 'facModel' },
+                { label: '备注信息', content: 'remark' },
+            ],
+            descriptionDetailsInfo: {},
         }
     },
     watch: {
@@ -795,8 +852,8 @@ export default {
         getList() {
             this.loading = true
             getListByMaType(this.queryParams).then((response) => {
-                this.typeList = response.data
+                this.typeList = response.data.rows
-                // this.total = response.total;
+                this.total = response.data.total
                 this.loading = false
             })
         },
@@ -1034,12 +1091,16 @@ export default {
 
             this.form.companyId = val.companyId
         },
+        // 详情
+        handleDetails(row) {
+            console.log(row, '详情----')
+            this.descriptionDetailsInfo = row
+            this.dialogConfig.outerVisible = true
+        },
+        /* 外层弹框关闭 */
+        closeDialogOuter() {
+            this.dialogConfig.outerVisible = false
+        },
     },
 }
 </script>
-<style lang="scss" scoped>
-::v-deep.el-table .fixed-width .el-button--mini {
-    width: 60px !important;
-    margin-bottom: 10px;
-}
-</style>

sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue

@@ -132,7 +132,6 @@
             <el-table-column label="操作" align="center" width="250">
                 <template slot-scope="scope">
                     <el-button
-                        size="mini"
                         type="text"
                         icon="el-icon-zoom-in"
                         @click="handleView(scope.row)"
@@ -140,7 +139,6 @@
                         >查看</el-button
                     >
                     <el-button
-                        size="mini"
                         type="text"
                         icon="el-icon-edit"
                         v-if="scope.row.taskStatus == 68"
@@ -149,24 +147,24 @@
                         >编辑</el-button
                     >
                     <el-button
-                        size="mini"
                         type="text"
-                        icon="el-icon-edit"
+                        icon="el-icon-circle-check"
+                        style="color: #e6a23c"
                         v-if="scope.row.taskStatus == 68"
                         @click="handleCheck(scope.row)"
                         v-hasPermi="['newPurchase:parts:accept']"
                         >验收</el-button
                     >
                     <el-button
-                        size="mini"
                         type="text"
-                        icon="el-icon-edit"
+                        style="color: #67c23a"
+                        icon="el-icon-tickets"
                         v-if="scope.row.taskStatus != 68"
                         @click="handleBuy(scope.row)"
                         >验收单</el-button
                     >
                     <el-button
-                        size="mini"
+                        style="color: #f56c6c"
                         type="text"
                         icon="el-icon-delete"
                         v-if="scope.row.taskStatus == 68"

sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue

@@ -100,7 +100,7 @@
             ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="tableList">
+        <el-table v-loading="loading" :data="tableList" border>
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
             <el-table-column
                 align="center"
@@ -133,14 +133,12 @@
                 align="center"
                 prop="purchasingTypeName"
                 :show-overflow-tooltip="true"
-                width="250"
             />
             <el-table-column
                 label="采购员"
                 align="center"
                 prop="purchaserName"
                 :show-overflow-tooltip="true"
-                width="100"
             />
             <el-table-column
                 label="提交时间"
@@ -167,15 +165,10 @@
                 prop="remark"
                 :show-overflow-tooltip="true"
             />
-            <el-table-column
+            <el-table-column label="操作" align="center">
-                label="操作"
-                align="center"
-                class-name="small-padding fixed-width"
-                width="200"
-            >
                 <template slot-scope="scope">
                     <el-button
-                        size="mini"
+                        type="text"
                         icon="el-icon-zoom-in"
                         @click="handleView(scope.row)"
                         v-hasPermi="['newPurchase:service:view']"
@@ -183,9 +176,9 @@
                     >
 
                     <el-button
-                        size="mini"
+                        style="color: #e6a23c"
-                        type="primary"
+                        type="text"
-                        icon="el-icon-edit"
+                        icon="el-icon-finished"
                         v-if="scope.row.taskStatus == '122'"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['newPurchase:service:auditing']"

sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue

@@ -174,7 +174,6 @@
             <el-table-column label="操作" align="center" width="200">
                 <template slot-scope="scope">
                     <el-button
-                        size="mini"
                         type="text"
                         icon="el-icon-zoom-in"
                         @click="handleView(scope.row)"
@@ -182,7 +181,6 @@
                         >查看</el-button
                     >
                     <el-button
-                        size="mini"
                         type="text"
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
@@ -191,9 +189,9 @@
                         >编辑</el-button
                     >
                     <el-button
-                        size="mini"
                         type="text"
-                        icon="el-icon-edit"
+                        icon="el-icon-circle-check"
+                        style="color: #e6a23c"
                         v-if="
                             scope.row.purchasingStatus == '待通知' ||
                             scope.row.purchasingStatus == '待验收'
@@ -203,9 +201,9 @@
                         >验收</el-button
                     >
                     <el-button
-                        size="mini"
                         type="text"
-                        icon="el-icon-edit"
+                        icon="el-icon-edit-outline"
+                        style="color: #67c23a"
                         v-if="
                             scope.row.purchasingStatus == '验收合格' &&
                             scope.row.manageType != '1'
@@ -215,9 +213,9 @@
                         >编码管理</el-button
                     >
                     <el-button
-                        size="mini"
                         type="text"
-                        icon="el-icon-edit"
+                        icon="el-icon-tickets"
+                        style="color: #e6a23c"
                         v-if="
                             scope.row.purchasingStatus == '验收合格' ||
                             scope.row.purchasingStatus ==
@@ -231,17 +229,16 @@
                         >验收单</el-button
                     >
                     <el-button
-                        size="mini"
                         type="text"
-                        icon="el-icon-edit"
+                        icon="el-icon-circle-check"
                         v-if="scope.row.purchasingStatus == '验收合格'"
                         @click="handleSubmit(scope.row)"
                         >提交审核</el-button
                     >
 
                     <el-button
-                        size="mini"
                         type="text"
+                        style="color: #f56c6c"
                         icon="el-icon-delete"
                         v-if="
                             scope.row.purchasingStatus == '待通知' ||

sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue

@@ -185,7 +185,6 @@
             <el-table-column label="操作" align="center" width="180">
                 <template slot-scope="scope">
                     <el-button
-                        size="mini"
                         type="text"
                         icon="el-icon-zoom-in"
                         @click="handleView(scope.row)"
@@ -194,18 +193,18 @@
                     >
 
                     <el-button
-                        size="mini"
+                        style="color: #e6a23c"
                         type="text"
-                        icon="el-icon-edit"
+                        icon="el-icon-finished"
                         v-if="scope.row.taskStatus == '105'"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['warehousing:newTools:auditing']"
                         >审核</el-button
                     >
                     <el-button
-                        size="mini"
                         type="text"
-                        icon="el-icon-edit"
+                        icon="el-icon-tickets"
+                        style="color: #67c23a"
                         v-if="
                             scope.row.taskStatus == '28' ||
                             scope.row.taskStatus == '123'
@@ -369,7 +368,6 @@
                 <el-table-column
                     label="操作"
                     align="center"
-                    class-name="small-padding fixed-width"
                     v-if="showHandle"
                     width="150"
                 >
@@ -382,8 +380,9 @@
                         "
                     >
                         <el-button
-                            size="mini"
                             type="text"
+                            icon="el-icon-check"
+                            style="color: #67c23a"
                             v-if="
                                 (scope.row.status == '0' ||
                                     scope.row.status == '3') &&
@@ -393,8 +392,9 @@
                             >通过</el-button
                         >
                         <el-button
-                            size="mini"
                             type="text"
+                            icon="el-icon-close"
+                            style="color: #f56c6c"
                             v-if="
                                 (scope.row.status == '0' ||
                                     scope.row.status == '3') &&

sgzb-ui/vue.config.js

@@ -43,7 +43,7 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://192.168.2.122:38080`, //超
+        // target: `http://192.168.2.122:28080`, //超
         // target: `http://10.40.92.81:28080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
         // target: `http://10.40.92.140:28080`, //帅