首页,报废,查询修改

src/components/setting/SettingDrawer.vue

@@ -144,14 +144,14 @@
           </div>
         </div>
         <a-divider />
-        <div :style="{ marginBottom: '24px' }">
+<!--        <div :style="{ marginBottom: '24px' }">-->
-          <a-alert type="warning">
+<!--          <a-alert type="warning">-->
-            <span slot="message">
+<!--            <span slot="message">-->
-              配置栏只在开发环境用于预览，生产环境不会展现，请手动修改配置文件
+<!--              配置栏只在开发环境用于预览，生产环境不会展现，请手动修改配置文件-->
-              <a href="https://github.com/sendya/ant-design-pro-vue/blob/master/src/defaultSettings.js" target="_blank">src/defaultSettings.js</a>
+<!--              <a href="https://github.com/sendya/ant-design-pro-vue/blob/master/src/defaultSettings.js" target="_blank">src/defaultSettings.js</a>-->
-            </span>
+<!--            </span>-->
-          </a-alert>
+<!--          </a-alert>-->
-        </div>
+<!--        </div>-->
       </div>
       <div class="setting-drawer-index-handle" @click="toggle" v-if="visible">
 <!--        <a-icon type="setting" v-if="!visible"/>-->

src/views/dashboard/Analysis.vue

@@ -4,9 +4,11 @@
 <!--    <b-pdf :file="'60137d6395657f2fee283f13'"></b-pdf>-->
 <!--    <b-pdf :file="'http://storage.xuetangx.com/public_assets/xuetangx/PDF/PlayerAPI_v1.0.6.pdf'"></b-pdf>-->
 <!--    <index-chart v-if="indexStyle==1"></index-chart>-->
-    <NewHomePage v-if="indexStyle == 1"/>
+    <NewHomePage v-if="indexStyle == 4"/>
     <index-bdc v-if="indexStyle==2"></index-bdc>
     <index-task v-if="indexStyle==3"></index-task>
+    <HomePage v-if="indexStyle==1"></HomePage>
+
 <!--    <div style="width: 100%;text-align: right;margin-top: 20px">-->
 <!--      请选择首页样式：-->
 <!--      <a-radio-group v-model="indexStyle">-->
@@ -25,6 +27,7 @@
   import NewHomePage from '@views/dashboard/NewHomePage'
   import FileMangement from "@/extends/FileMangement/fileMangement";
   import BPdf from "@/extends/Bpdf/Bpdf";
+  import HomePage from '@views/dashboard/HomePage'
 
   export default {
     name: "Analysis",
@@ -34,7 +37,8 @@
       IndexChart,
       IndexTask,
       IndexBdc,
-      NewHomePage
+      NewHomePage,
+      HomePage
     },
     data() {
       return {

src/views/dashboard/HomePage.vue

@@ -0,0 +1,115 @@
+<template>
+  <div style="width: 1680px;height: 780px;">
+    <div style="width: 90%;;height: 100%;">
+      <div style="display: flex;align-items: center;justify-content: stretch;width: 100%;height: 50%">
+        <div style="width: 55%;;margin-left: 6%;margin-top:3%;height: 100%;">
+          <a-card style="width: 100%;height: 100%;border-radius: 20px;">
+            <span class="font" style="display: inline-block;height: 10%;"><i class="iconfont icon-daibanrenwu" style="font-size: 35px;"></i>待办
+            <i class="iconfont icon-shenglvehao"></i>
+            </span>
+            <div style="width: 100%;height: 150px">
+              暂无待办
+            </div>
+            <a-divider style="border: 1px solid #c7c7c7"/>
+            <ul class="ul-li" style="list-style-type:none;padding-left: 0px;">
+<!--              这里可以用for循环-->
+              <li><a-tag color="#539ee6">物资审批1</a-tag><span style="margin-left: 70px">关于xxxx物资的审批流程</span><span style="margin-left: 150px">2020.10.1 10:10:20</span></li>
+              <li><a-tag color="#539ee6">物资审批2</a-tag><span style="margin-left: 70px">关于xxxx物资的审批流程</span><span style="margin-left: 150px">2020.10.1 10:10:20</span></li>
+              <li><a-tag color="#539ee6">物资审批3</a-tag><span style="margin-left: 70px">关于xxxx物资的审批流程</span><span style="margin-left: 150px">2020.10.1 10:10:20</span></li>
+            </ul>
+          </a-card>
+        </div>
+
+        <div style="width: 55%;margin-left: 3%;margin-top:3%; height: 100%;">
+          <a-card style="width: 100%;height: 100%;border-radius: 20px;">
+            <span class="font" style="display: inline-block;height: 10%;"><i class="iconfont icon-rizhi-copy" style="font-size: 30px;"></i>登录日志
+            <i class="iconfont icon-shenglvehao"></i>
+            </span>
+            <ul class="ul-li" style="list-style-type:none;padding-left: 0px;">
+<!--              这里可以用for循环-->
+              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
+              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
+              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
+              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
+              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
+              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
+              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
+              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
+              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
+            </ul>
+          </a-card>
+        </div>
+      </div>
+      <div style="width: 100%;margin-top: 5%;margin-left: 6%;height: 70%">
+        <a-card style="width: 94%;height: 90%;border-radius: 20px;">
+            <span class="font" style="display: inline-block;height: 10%;"><i class="iconfont icon-rizhi-copy" style="font-size: 30px;"></i>全部应用
+            </span>
+          <ul class="apply-use" style="list-style-type: none;padding: 0px">
+            <li><i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资审批</span></li>
+            <li><i class="iconfont icon-suggest-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资申领</span></li>
+            <li><i class="iconfont icon-process-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资报废</span></li>
+            <li><i class="iconfont icon-suggest-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资申领</span></li>
+            <li><i class="iconfont icon-process-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资报废</span></li>
+            <li><i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资审批</span></li>
+            <li><i class="iconfont icon-suggest-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资申领</span></li>
+            <li><i class="iconfont icon-process-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资报废</span></li>
+            <li><i class="iconfont icon-suggest-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资申领</span></li>
+            <li><i class="iconfont icon-process-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资报废</span></li>
+            <li><i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资审批</span></li>
+            <li><i class="iconfont icon-suggest-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资申领</span></li>
+            <li><i class="iconfont icon-process-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资报废</span></li>
+            <li><i class="iconfont icon-suggest-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资申领</span></li>
+            <li><i class="iconfont icon-process-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资报废</span></li>
+          </ul>
+        </a-card>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'HomePage'
+}
+</script>
+
+
+<style scoped>
+@import url("http://at.alicdn.com/t/c/font_3733417_ws9m9bvag1h.css");
+.border-style{
+  width: 40%;
+  height: 50%;
+  border: 1px solid lightgrey;
+  border-radius: 15px;
+  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;
+}
+
+.iconfont{
+  vertical-align: -10%;
+}
+.apply-use li{
+  float: left;
+  border: 1px solid black;
+  width: 15%;
+  height: 60px;
+  margin: 40px 0 0 60px;
+}
+
+
+</style>

src/views/dashboard/NewHomePage.vue

@@ -162,6 +162,7 @@ name: "NewHomePage",
         //     bottom: '3%',
         //     containLabel: true
         //   },
+
         //   // toolbox: {
         //   //   feature: {
         //   //     saveAsImage: {}

src/views/suppliesstronger/ProcessSuppliesStrongerList.vue

@@ -35,7 +35,6 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</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>

src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue

@@ -14,7 +14,7 @@
                 <a-input placeholder="请输入物料组" v-model="queryParam.itemGroup"/>
               </a-form-item>
             </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="16">
+            <a-col :xl="4" :lg="7" :md="8" :sm="16" hidden="hidden" >
               <a-form-item label="物料">
                 <a-input placeholder="请输入物料" v-model="queryParam.item" disabled="disabled"/>
               </a-form-item>
@@ -35,8 +35,13 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="生产时间">
+              <a-form-item label="生产日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-date placeholder="请选择生产时间" v-model="queryParam.productionTime"></j-date>
+                <a-range-picker
+                  style="width: 210px"
+                  format="YYYY-MM-DD"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="onDateChange"
+                />
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
@@ -50,8 +55,13 @@
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
-              <a-form-item label="入库时间">
+              <a-form-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-date placeholder="请选择入库时间" v-model="queryParam.inboundTime"></j-date>
+                <a-range-picker
+                  style="width: 210px"
+                  format="YYYY-MM-DD"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="onDateChangeinboundTime"
+                />
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
@@ -66,10 +76,6 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <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 type="primary" @click="searchQuery" icon="search">查询</a-button>
       <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
 
@@ -293,6 +299,14 @@
         },
         dictOptions:{},
         superFieldList:[],
+        labelCol: {
+          xs: { span: 4 },
+          sm: { span: 4 },
+        },
+        wrapperCol: {
+          xs: { span: 20 },
+          sm: { span: 20 },
+        },
       }
     },
     created() {
@@ -312,6 +326,14 @@
       },
     },
     methods: {
+      onDateChange: function (value, dateString) {
+        this.queryParam.productDateBegin=dateString[0];
+        this.queryParam.productDateEnd=dateString[1];
+      },
+      onDateChangeinboundTime: function (value, dateString) {
+        this.queryParam.inboundDateBegin=dateString[0];
+        this.queryParam.inboundDateEnd=dateString[1];
+      },
       searchReset(){
         this.queryParam = {
           supplier: null,

src/views/waste/ProcessWasteList.vue

@@ -4,76 +4,41 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="3" :lg="5" :md="5" :sm="18">
+          <a-col :xl="4" :lg="7" :md="8" :sm="16">
             <a-form-item label="物资名称">
               <a-input placeholder="请输入物资名称" v-model="queryParam.materialName" dict=",,"/>
             </a-form-item>
           </a-col>
-          <a-col :xl="3" :lg="5" :md="5" :sm="18">
+          <a-col :md="6" :sm="10">
-            <a-form-item label="报废日期">
+            <a-form-item label="报废日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择报废日期" v-model="queryParam.scrapDate"></j-date>
+              <a-range-picker
+                style="width: 210px"
+                format="YYYY-MM-DD"
+                :placeholder="['开始时间', '结束时间']"
+                @change="onDateChange"
+              />
             </a-form-item>
           </a-col>
-          <a-col :xl="3" :lg="5" :md="5" :sm="18">
+          <a-col :xl="4" :lg="7" :md="8" :sm="16">
-            <a-form-item label="物料码">
+          <a-form-item label="物料码">
               <a-input placeholder="请输入物料码" v-model="queryParam.descriptionId" dict=",,"/>
             </a-form-item>
           </a-col>
-<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+          <a-col :xl="4" :lg="7" :md="8" :sm="16">
-<!--            <a-form-item label="品牌">-->
-<!--              <a-input placeholder="请输入品牌" v-model="queryParam.brand"></a-input>-->
-<!--            </a-form-item>-->
-<!--          </a-col>-->
-<!--          <template v-if="toggleSearchStatus">-->
-
-<!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-<!--              <a-form-item label="型号规格">-->
-<!--                <a-input placeholder="请输入型号规格" v-model="queryParam.typeSpecification"></a-input>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-<!--              <a-form-item label="单位">-->
-<!--                <j-search-select-tag placeholder="请选择单位" v-model="queryParam.unit" dict=",,"/>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-<!--              <a-form-item label="数量">-->
-<!--                <a-input placeholder="请输入数量" v-model="queryParam.number"></a-input>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-          <a-col :xl="3" :lg="5" :md="5" :sm="18">
             <a-form-item label="所属单位">
               <a-input placeholder="请选择所属单位" v-model="queryParam.affiliation" dict=",,"/>
             </a-form-item>
           </a-col>
-            <a-col :xl="3" :lg="5" :md="5" :sm="18">
+          <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="仓库位置">
                 <a-input placeholder="请选择仓库位置" v-model="queryParam.depositary" dict=",,"/>
               </a-form-item>
             </a-col>
-          <a-col :xl="3" :lg="5" :md="5" :sm="18">
+          <a-col :xl="4" :lg="7" :md="8" :sm="16">
             <a-form-item label="创建人">
               <a-input placeholder="请选择创建人" v-model="queryParam.createBy" dict=",,"/>
             </a-form-item>
           </a-col>
-<!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-<!--              <a-form-item label="报废原因">-->
-<!--                <a-input placeholder="请输入报废原因" v-model="queryParam.scrappedBecause"></a-input>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-
-
-<!--          </template>-->
-<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-<!--            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
-<!--              <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 @click="handleToggleSearch" style="margin-left: 8px">-->
-<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
-<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
-<!--              </a>-->
-<!--            </span>-->
-<!--          </a-col>-->
         </a-row>
       </a-form>
     </div>
@@ -89,8 +54,6 @@
         <a-button type="primary" icon="import">导入</a-button>
 
       </a-upload>
-      <!-- 高级查询区域 -->
-<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <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>
@@ -200,11 +163,6 @@
               return parseInt(index)+1;
             }
           },
-          // {
-          //   title:'创建人',
-          //   align:"center",
-          //   dataIndex: 'createBy_dictText'
-          // },
           {
             title:'物料码',
             align:"center",
@@ -257,15 +215,7 @@
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
             }
-          },
+          }
-          // {
-          //   title: '操作',
-          //   dataIndex: 'action',
-          //   align:"center",
-          //   fixed:"right",
-          //   width:147,
-          //   scopedSlots: { customRender: 'action' }
-          // }
         ],
         url: {
           list: "/waste/processWaste/list",
@@ -273,10 +223,18 @@
           deleteBatch: "/waste/processWaste/deleteBatch",
           exportXlsUrl: "/waste/processWaste/exportXls",
           importExcelUrl: "waste/processWaste/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
+        labelCol: {
+          xs: { span: 4 },
+          sm: { span: 4 },
+        },
+        wrapperCol: {
+          xs: { span: 20 },
+          sm: { span: 20 },
+        },
       }
     },
     created() {
@@ -288,6 +246,10 @@
       },
     },
     methods: {
+      onDateChange: function (value, dateString) {
+        this.queryParam.scrapDateBegin=dateString[0];
+        this.queryParam.scrapDateEnd=dateString[1];
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

src/views/wastematerials/ProcessWasteMaterialsLists.vue

@@ -20,7 +20,7 @@
                 <a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24" hidden="hidden">
               <a-form-item label="物料">
                 <a-input placeholder="请输入物料" v-model="queryParam.material" disabled="disabled"></a-input>
               </a-form-item>
@@ -35,9 +35,14 @@
                 <a-input placeholder="请输入所属工作队" v-model="queryParam.theirTeam"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :md="6" :sm="10">
-              <a-form-item label="生产日期">
+              <a-form-item label="生产日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-date placeholder="请选择生产日期" v-model="queryParam.productionDate"></j-date>
+                <a-range-picker
+                  style="width: 210px"
+                  format="YYYY-MM-DD"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="onDateChange"
+                />
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -46,8 +51,13 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="入库时间">
+              <a-form-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-date placeholder="请选择入库时间" v-model="queryParam.inboundTime"></j-date>
+                <a-range-picker
+                  style="width: 210px"
+                  format="YYYY-MM-DD"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="onDateChangeinboundTime"
+                />
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -260,6 +270,14 @@
         },
         dictOptions:{},
         superFieldList:[],
+        labelCol: {
+          xs: { span: 4 },
+          sm: { span: 4 },
+        },
+        wrapperCol: {
+          xs: { span: 20 },
+          sm: { span: 20 },
+        },
       }
     },
     created() {
@@ -279,6 +297,14 @@
       },
     },
     methods: {
+      onDateChange: function (value, dateString) {
+        this.queryParam.productDateBegin=dateString[0];
+        this.queryParam.productDateEnd=dateString[1];
+      },
+      onDateChangeinboundTime: function (value, dateString) {
+        this.queryParam.inboundDateBegin=dateString[0];
+        this.queryParam.inboundDateEnd=dateString[1];
+      },
       judgeRouterParam(){
         if (this.$route.params.material == null){
           this.$router.go(-1);