From 406de3117d385d3a6d8d136a0dbb4880320484f4 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Tue, 1 Nov 2022 18:09:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/HomePage.vue              |  50 ++---
 .../ProcessSuppliesStrongerList.vue           |  32 +--
 src/views/waste/ProcessWasteList.vue          |  49 ++---
 src/views/waste/ProcessWasteListCable.vue     | 203 ++++++++++++++++++
 .../ProcessWasteMaterialsLists.vue            |  14 +-
 5 files changed, 259 insertions(+), 89 deletions(-)
 create mode 100644 src/views/waste/ProcessWasteListCable.vue

diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue
index d8db067..5a6b5d4 100644
--- a/src/views/dashboard/HomePage.vue
+++ b/src/views/dashboard/HomePage.vue
@@ -1,25 +1,22 @@
 <template>
   <div style="height: 740px;">
-    <div style="height: 100%;">
+    <div style="width: 100% ;height: 100%;">
 
       <div style="display: flex;align-items: center;justify-content: stretch;width: 100%;height: 50%">
 
         <!--待办任务-->
-        <div class="top-div ant-col-md-8">
-          <a-card class="div-card" title="待办" >
-            <div style="width: 100%;height: 100%;" v-show="showDate.noDate">
-              暂无待办
-            </div>
-            <ul class="ul-li" style="list-style-type:none;padding-left: 0px;" v-show="showDate.showDate">
+        <div class="top-div ant-col-md-7">
+          <a-card class="div-card" title="待办" style="overflow: hidden" >
+            <ul class="ul-li" style="width: 100%; list-style-type:none;padding-left: 0px;" v-show="showDate.showDate">
               <!--这里可以用for循环-->
               <!--用于存放从数据库中查出来的信息并对其进行循环-->
               <li v-for="(task,index) in tasks " style="width: 100%;">
                 <!--类型-->
-                  <a-button class="ant-col-md-4" type="primary" style="width: 80px;height: 25px;">{{task.type}}</a-button>
-                  <span class="ant-col-md-8" :title='task.message' style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;margin-left: 50px;line-height: 25px;">
+                <a-button class="ant-col-md-4" type="primary" style="width: 80px;height: 25px;">{{task.type}}</a-button>
+                <span class="ant-col-md-10" :title='task.message' style="padding-left: 10%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;line-height: 25px;">
                     {{task.message}}
                   </span>
-                  <span class="ant-col-md-8" :title='task.time' style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;margin-left: 60px;line-height: 25px;">
+                <span class="ant-col-md-10" :title='task.time' style="padding-left: 10%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;text-align: right; line-height: 25px;">
                     {{task.time}}
                   </span>
               </li>
@@ -29,24 +26,24 @@
         </div>
 
         <!--站内消息-->
-        <div class="top-div ant-col-md-8" >
-          <a-card class="div-card" title="站内消息">
+        <div class="top-div ant-col-md-9" style="margin: 0 2%;">
+          <a-card class="div-card" title="站内消息" style="overflow: hidden">
           </a-card>
         </div>
 
         <!--登录日志-->
-        <div class="top-div ant-col-md-8">
-          <a-card class="div-card"  title="登录日志">
+        <div class="top-div ant-col-md-7">
+          <a-card class="div-card"  title="登录日志" style="overflow: hidden">
             <ul class="ul-li" style="list-style-type:none;padding-left: 0px;">
               <!--这里可以用for循环-->
               <!--当一个用户登录后增加一条数据-->
               <li v-for="(loginlog,index) in loginlogs" style="width: 100%;">
                 <!--类型-->
-                <a-button class="ant-col-md-4" type="primary" style="width: 80px;height: 25px;">{{loginlog.department}}</a-button>
-                <span class="ant-col-md-8" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;margin-left: 90px;line-height: 25px;">
+                <a-button class="ant-col-md-8" type="primary" style="width: 80px;height: 25px;">{{loginlog.department}}</a-button>
+                <span class="ant-col-md-9" style="text-align: center; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;line-height: 25px;">
                   {{loginlog.loginName}}
                 </span>
-                <span class="ant-col-md-8" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;margin-left: 20px;line-height: 25px;">
+                <span class="ant-col-md-10" style="text-align: right; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;line-height: 25px;">
                   {{loginlog.loginTime}}
                 </span>
 
@@ -57,6 +54,7 @@
 
       </div>
 
+
       <div class="bottom-div" style="width: 100%;height: 70%;margin-top: 0.5%">
         <a-card style="width: 100%;height: 90%;border-radius: 10px;" title="全部应用">
           <ul class="apply-use" style="list-style-type: none;padding: 0px">
@@ -221,24 +219,6 @@ export default {
   border-radius: 5px;
 }
 
-.border-style{
-  width: 40%;
-  height: 50%;
-  border: 1px solid lightgrey;
-  border-radius: 10px;
-  background-color: #ffffff;
-  margin: 30px 0 0 50px;
-  box-shadow: 0 0 2px 2px lightgrey;
-  display: inline-block;
-  padding: 2%;
-  font-size: 30px;
-}
-
-.font{
-  font-size: 12px;
-  font-width: bold;
-}
-
 .ul-li li{
   margin-top: 10px;
   display: inline-flex;
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index 1cc3368..f3f5836 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -208,25 +208,25 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'processId',text:'流程表单号',dictCode:''})
-        fieldList.push({type:'string',value:'supplier',text:'供应商',dictCode:''})
-        fieldList.push({type:'string',value:'supplierDescription',text:'供应商描述',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'string',value:'itemGroup',text:'物料组',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'string',value:'item',text:'物料',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'string',value:'itemDescription',text:'物料描述',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'string',value:'unitMeasurement',text:'计量单位',dictCode:''})
-        fieldList.push({type:'int',value:'amount',text:'数量',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'rates',text:'金额',dictCode:''})
-        fieldList.push({type:'string',value:'unitWasteWarehouseCodeId',text:'仓储地点',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'string',value:'freightSpace',text:'存储仓位',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'processId',text:'流程表单号'})
+        fieldList.push({type:'string',value:'supplier',text:'供应商'})
+        fieldList.push({type:'string',value:'supplierDescription',text:'供应商描述'})
+        fieldList.push({type:'string',value:'itemGroup',text:'物料组'})
+        fieldList.push({type:'string',value:'item',text:'物料'})
+        fieldList.push({type:'string',value:'itemDescription',text:'物料描述'})
+        fieldList.push({type:'string',value:'unitMeasurement',text:'计量单位'})
+        fieldList.push({type:'int',value:'amount',text:'数量'})
+        fieldList.push({type:'BigDecimal',value:'price',text:'单价'})
+        fieldList.push({type:'BigDecimal',value:'rates',text:'金额'})
+        fieldList.push({type:'string',value:'unitWasteWarehouseCodeId',text:'仓储地点'})
+        fieldList.push({type:'string',value:'freightSpace',text:'存储仓位'})
         fieldList.push({type:'date',value:'productionTime',text:'生产时间'})
         fieldList.push({type:'string',value:'expirationDate',text:'保质期'})
-        fieldList.push({type:'string',value:'batch',text:'批次',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'string',value:'arrivalNotice',text:'是否到货',dictCode:''})
+        fieldList.push({type:'string',value:'batch',text:'批次',dictTable:''})
+        fieldList.push({type:'string',value:'arrivalNotice',text:'是否到货'})
         fieldList.push({type:'date',value:'inboundTime',text:'入库时间'})
-        fieldList.push({type:'string',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'int',value:'accountingAttributes',text:'核算属性',dictCode:''})
+        fieldList.push({type:'string',value:'librarySign',text:'入库人'})
+        fieldList.push({type:'int',value:'accountingAttributes',text:'核算属性'})
         this.superFieldList = fieldList
 
 
diff --git a/src/views/waste/ProcessWasteList.vue b/src/views/waste/ProcessWasteList.vue
index 9232d9b..704ecf1 100644
--- a/src/views/waste/ProcessWasteList.vue
+++ b/src/views/waste/ProcessWasteList.vue
@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :xl="4" :lg="7" :md="8" :sm="16">
             <a-form-item label="物资名称">
-              <a-input placeholder="请输入物资名称" v-model="queryParam.materialName" dict=",,"/>
+              <a-input placeholder="请输入物资名称" v-model="queryParam.materialName"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="10">
@@ -14,6 +14,7 @@
               <a-range-picker
                 style="width: 210px"
                 format="YYYY-MM-DD"
+                :value="createScrapTime"
                 :placeholder="['开始时间', '结束时间']"
                 @change="onDateChange"
               />
@@ -21,12 +22,12 @@
           </a-col>
           <a-col :xl="4" :lg="7" :md="8" :sm="16">
           <a-form-item label="物料码">
-              <a-input placeholder="请输入物料码" v-model="queryParam.descriptionId" dict=",,"/>
+              <a-input placeholder="请输入物料码" v-model="queryParam.descriptionId"/>
             </a-form-item>
           </a-col>
           <a-col :xl="4" :lg="7" :md="8" :sm="16">
             <a-form-item label="所属单位">
-              <a-input placeholder="请选择所属单位" v-model="queryParam.affiliation" dict=",,"/>
+              <a-input placeholder="请选择所属单位" v-model="queryParam.affiliation"/>
             </a-form-item>
           </a-col>
           <a-col :xl="4" :lg="7" :md="8" :sm="16">
@@ -46,14 +47,13 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
       <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('废旧物资库表')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-
       </a-upload>
+      <a-button @click="handleInto" type="primary">电缆</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -103,25 +103,6 @@
           </a-button>
         </template>
 
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
       </a-table>
     </div>
 
@@ -138,6 +119,8 @@
   import JDate from '@/components/jeecg/JDate.vue'
   import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import ProcessWasteListCable from '@views/waste/ProcessWasteListCable'
+  import { getAction } from '@api/manage'
 
   export default {
     name: 'ProcessWasteList',
@@ -147,9 +130,11 @@
       JSearchSelectTag,
       ProcessWasteModal,
       JSuperQuery,
+      ProcessWasteListCable,
     },
     data () {
       return {
+        createScrapTime: [],
         description: '废旧物资库表管理页面',
         // 表头
         columns: [
@@ -174,7 +159,7 @@
             dataIndex: 'brand'
           },
           {
-            title:'物资名称',
+            title:'名称',
             align:"center",
             dataIndex: 'materialName'
           },
@@ -194,7 +179,7 @@
             dataIndex: 'number'
           },
           {
-            title:'存放位置',
+            title:'存放地点',
             align:"center",
             dataIndex: 'depositary'
           },
@@ -246,7 +231,19 @@
       },
     },
     methods: {
+      searchReset(){
+        this.createScrapTime = []
+        getAction(this.url.list).then((res)=>{
+          if(res.success){
+            this.dataSource=res.result.records;
+          }
+        });
+      },
+      handleInto() {
+        this.$router.push({name:'src-views-waste-ProcessWasteListCable'})
+      },
       onDateChange: function (value, dateString) {
+        this.createScrapTime = value;
         this.queryParam.scrapDateBegin=dateString[0];
         this.queryParam.scrapDateEnd=dateString[1];
       },
diff --git a/src/views/waste/ProcessWasteListCable.vue b/src/views/waste/ProcessWasteListCable.vue
new file mode 100644
index 0000000..cfa57a6
--- /dev/null
+++ b/src/views/waste/ProcessWasteListCable.vue
@@ -0,0 +1,203 @@
+<template>
+  <a-card :bordered="false">
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <process-waste-modal ref="modalForm" @ok="modalFormOk"></process-waste-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProcessWasteModal from './modules/ProcessWasteModal'
+  import JDate from '@/components/jeecg/JDate.vue'
+  import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+
+  export default {
+    name: 'ProcessWasteListCable',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      JDate,
+      JSearchSelectTag,
+      ProcessWasteModal,
+      JSuperQuery,
+    },
+    data () {
+      return {
+        description: '废旧台账',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'报废日期',
+            align:"center",
+            dataIndex: 'scrapDate'
+          },
+          {
+            title:'原盘号',
+            align:"center",
+            dataIndex: 'originalPlate'
+          },
+          {
+            title:'现盘号',
+            align:"center",
+            dataIndex: 'nowNumberPlate'
+          },
+          {
+            title:'电缆规格',
+            align:"center",
+            dataIndex: 'typeSpecification'
+          },
+          {
+            title:'缴料队组',
+            align:"center",
+            dataIndex: 'payMaterial'
+          },
+          {
+            title:'车号',
+            align:"center",
+            dataIndex: 'payMaterial'
+          },
+          {
+            title:'原长度(米)',
+            align:"center",
+            dataIndex: 'originalLength'
+          },
+          {
+            title:'现长度(米)',
+            align:"center",
+            dataIndex: 'nowLength'
+          },
+          {
+            title:'缴料人',
+            align:"center",
+            dataIndex: 'payMaterialPeople'
+          },
+          {
+            title:'存放地',
+            align:"center",
+            dataIndex: 'depositary'
+          },
+          {
+            title:'报废原因',
+            align:"center",
+            dataIndex: 'scrappedBecause'
+          },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
+        ],
+        url: {
+          list: "/waste/processWaste/listCable",
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'sel_search',value:'createBy',text:'创建人',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'sel_search',value:'descriptionId',text:'物料码',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'brand',text:'品牌',dictCode:''})
+        fieldList.push({type:'sel_search',value:'materialName',text:'名称',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'typeSpecification',text:'型号规格',dictCode:''})
+        fieldList.push({type:'sel_search',value:'unit',text:'单位',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'int',value:'number',text:'数量',dictCode:''})
+        fieldList.push({type:'sel_search',value:'depositary',text:'存放位置',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'scrappedBecause',text:'报废原因',dictCode:''})
+        fieldList.push({type:'sel_search',value:'affiliation',text:'所属单位',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'date',value:'scrapDate',text:'报废日期'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/wastematerials/ProcessWasteMaterialsLists.vue b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
index 2bd3d4d..0951267 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsLists.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
@@ -230,12 +230,12 @@
             dataIndex: 'number'
           },
           {
-            title:'单价',
+            title:'单价(元)',
             align:"center",
             dataIndex: 'price'
           },
           {
-            title:'金额',
+            title:'金额(元)',
             align:"center",
             dataIndex: 'money'
           },
@@ -336,16 +336,6 @@
         this.createProductTime = [],
         this.createInnerTime = [],
         this.queryParam = {
-            supplier: null,
-            supplierDescription: null,
-            materialGroup : null,
-            material : null,
-            materialDescription: null,
-            theirTeam: null,
-            productionDate: null,
-            expirationDate: null,
-            inboundTime: null,
-            materialsState: null,
             descriptionId: this.$route.params.descriptionId,
             del_flag: 0
         },