From 67fbdc2864936b210c66189e90a7be547d52d653 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Fri, 21 Oct 2022 17:44:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../description/ProcessDescriptionList.vue    |  20 ++--
 .../modules/ProcessDescriptionForm.vue        |  22 ++--
 .../ProcessMaterialStorageList.vue            | 107 ++++++++++++------
 .../modules/ProcessMaterialStorageForm.vue    |  49 ++++----
 .../ProcessMerchandiseNewsList.vue            |  10 +-
 src/views/statisticanalysis/CostStatistic.vue |   2 +-
 .../costecharts/CaseCost.vue                  |  21 ++--
 .../statisticanalysis/costecharts/Cost.vue    |   7 +-
 .../costecharts/CostAnalysis.vue              |   2 +-
 .../costecharts/ItemCost.vue                  |   7 +-
 .../costecharts/OnDayCost.vue                 |   8 +-
 src/views/supplier/ProcessSupplierList.vue    |  92 ++++++++++-----
 .../supplier/modules/ProcessSupplierForm.vue  |  35 ++++--
 .../ProcessUnitWasteWarehouseCodeList.vue     |  31 ++---
 .../ProcessUnitWasteWarehouseCodeForm.vue     |  28 +++--
 .../ProcessUnitWasteWarehouseCodeModal.vue    |   2 +-
 16 files changed, 277 insertions(+), 166 deletions(-)

diff --git a/src/views/description/ProcessDescriptionList.vue b/src/views/description/ProcessDescriptionList.vue
index 66a6796..f2a6872 100644
--- a/src/views/description/ProcessDescriptionList.vue
+++ b/src/views/description/ProcessDescriptionList.vue
@@ -18,8 +18,8 @@
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="分类名称">
 <!--                <a-input placeholder="请输入分类名称" v-model="queryParam.classifyName"></a-input>-->
-                <a-select v-model="queryParam.bigCategoryId" placeholder="请选择" >
-                  <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.id">{{item.categoryName}}</a-select-option>
+                <a-select v-model="queryParam.classifyName" placeholder="请选择" >
+                  <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.classifyName">{{item.classifyName}}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -48,7 +48,7 @@
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <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>
@@ -105,9 +105,9 @@
           <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 @click="handleDetail(record)">详情</a>-->
+<!--              </a-menu-item>-->
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
@@ -169,7 +169,7 @@
           {
             title:'分类名称',
             align:"center",
-            dataIndex: 'bigCategoryId'
+            dataIndex: 'classifyName'
           },
           {
             title: '操作',
@@ -186,7 +186,7 @@
           deleteBatch: "/description/processDescription/deleteBatch",
           exportXlsUrl: "/description/processDescription/exportXls",
           importExcelUrl: "description/processDescription/importExcel",
-          categoryId: "/bigcategory/processBigCategory/list"
+          descriptionRake: "/description/processDescription/descriptionRake"
         },
         dictOptions:{},
         superFieldList:[],
@@ -215,10 +215,10 @@
           delFlag: 0,
           state: 0
         }
-        getAction(this.url.categoryId,par).then((res)=>{
+        getAction(this.url.descriptionRake,par).then((res)=>{
           if(res.success){
             // console.log(res.result.records);
-            this.bigId = res.result.records;
+            this.bigId = res.result;
           }
         });
       }
diff --git a/src/views/description/modules/ProcessDescriptionForm.vue b/src/views/description/modules/ProcessDescriptionForm.vue
index 1511061..097c859 100644
--- a/src/views/description/modules/ProcessDescriptionForm.vue
+++ b/src/views/description/modules/ProcessDescriptionForm.vue
@@ -17,8 +17,8 @@
             <a-form-item label="分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
 <!--              <a-input v-decorator="['classifyName']" placeholder="请输入分类名称"  ></a-input>-->
 <!--              <j-dict-select-tag type="list" v-decorator="['classifyName']" :trigger-change="true" dictCode="hardware_category" placeholder="请输入分类" />-->
-              <a-select v-decorator="['bigCategoryId']" placeholder="请选择" >
-                <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.id">{{item.categoryName}}</a-select-option>
+              <a-select v-decorator="['classifyName']" placeholder="请选择" >
+                <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.classifyName">{{item.classifyName}}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -84,7 +84,7 @@
           add: "/description/processDescription/add",
           edit: "/description/processDescription/edit",
           queryById: "/description/processDescription/queryById",
-          categoryId: "/bigcategory/processBigCategory/list"
+          descriptionRake: "/description/processDescription/descriptionRake"
         }
       }
     },
@@ -120,7 +120,7 @@
         this.model = Object.assign({}, record);
         this.visible = true;
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'materialClassify','descriptionName','bigCategoryId'))
+          this.form.setFieldsValue(pick(this.model,'materialClassify','descriptionName','classifyName'))
         })
       },
       //渲染流程表单数据
@@ -134,15 +134,15 @@
           });
         }
         //查询大品类数据
-        let par = {
-          classify: 1,
-          delFlag: 0,
-          state: 0
-        }
-        getAction(this.url.categoryId,par).then((res)=>{
+        // let par = {
+        //   classify: 1,
+        //   delFlag: 0,
+        //   state: 0
+        // }
+        getAction(this.url.descriptionRake,null).then((res)=>{
           if(res.success){
             // console.log(res.result.records);
-            this.bigId = res.result.records;
+            this.bigId = res.result;
           }
         });
       },
diff --git a/src/views/materialstorage/ProcessMaterialStorageList.vue b/src/views/materialstorage/ProcessMaterialStorageList.vue
index a96a196..d3958eb 100644
--- a/src/views/materialstorage/ProcessMaterialStorageList.vue
+++ b/src/views/materialstorage/ProcessMaterialStorageList.vue
@@ -5,35 +5,51 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="供应商ID">
-              <a-input placeholder="请输入供应商ID" v-model="queryParam.supplierId"></a-input>
+            <a-form-item label="供应商">
+              <a-input placeholder="请输入供应商" v-model="queryParam.supplierId"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="物料详情ID">
-              <a-input placeholder="请输入物料详情ID" v-model="queryParam.merchandiseNewsId"></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.merchandiseNewsId"></a-input>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="品名类ID">
-                <a-input placeholder="请输入品名类ID" v-model="queryParam.descriptionId"></a-input>
+              <a-form-item label="物料组名称">
+                <a-input placeholder="请输入物料组名称" v-model="queryParam.descriptionId"></a-input>
               </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.inventoryAddress"></a-input>
+<!--                <a-input placeholder="请输入库存地点" v-model="queryParam.inventoryAddress"></a-input>-->
+<!--                <a-select  placeholder="请选择库存地点" v-model="queryParam.inventoryAddress"-->
+<!--                           show-search-->
+<!--                           style="width: 100%"-->
+<!--                           :default-active-first-option="true"-->
+<!--                           :show-arrow="false"-->
+<!--                           :filter-option="false"-->
+<!--                           :not-found-content="null"-->
+<!--                           @search="handleExpressSearch"-->
+<!--                           @change="handleExpressChange"-->
+<!--                           @blur="handleExpressBlur"-->
+<!--                >     -->
+                  <a-select  placeholder="请选择库存地点" v-model="queryParam.inventoryAddress">
+                  <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.inventoryAddress">{{item.inventoryAddress}}</a-select-option>
+                </a-select>
+
               </a-form-item>
             </a-col>
+          <template v-if="toggleSearchStatus">
           </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>
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
             </span>
           </a-col>
         </a-row>
@@ -49,7 +65,7 @@
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <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>
@@ -132,6 +148,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ProcessMaterialStorageModal from './modules/ProcessMaterialStorageModal'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import { getAction } from '@api/manage'
 
   export default {
     name: 'ProcessMaterialStorageList',
@@ -143,10 +160,11 @@
     data () {
       return {
         description: '物资储存地址表管理页面',
+        bigId:[],
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -156,17 +174,17 @@
             }
           },
           {
-            title:'供应商ID',
+            title:'供应商',
             align:"center",
             dataIndex: 'supplierId'
           },
           {
-            title:'物料详情ID',
+            title:'物料描述',
             align:"center",
             dataIndex: 'merchandiseNewsId'
           },
           {
-            title:'品名类ID',
+            title:'物料组名称',
             align:"center",
             dataIndex: 'descriptionId'
           },
@@ -180,19 +198,19 @@
             align:"center",
             dataIndex: 'unit'
           },
-          {
-            title:'删除标志',
-            align:"center",
-            dataIndex: 'delFlag'
-          },
-          {
-            title:'删除时间',
-            align:"center",
-            dataIndex: 'delTime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
+          // {
+          //   title:'删除标志',
+          //   align:"center",
+          //   dataIndex: 'delFlag'
+          // },
+          // {
+          //   title:'删除时间',
+          //   align:"center",
+          //   dataIndex: 'delTime',
+          //   customRender:function (text) {
+          //     return !text?"":(text.length>10?text.substr(0,10):text)
+          //   }
+          // },
           {
             title: '操作',
             dataIndex: 'action',
@@ -208,7 +226,8 @@
           deleteBatch: "/materialstorage/processMaterialStorage/deleteBatch",
           exportXlsUrl: "/materialstorage/processMaterialStorage/exportXls",
           importExcelUrl: "materialstorage/processMaterialStorage/importExcel",
-          
+          addressUrl:"/materialstorage/processMaterialStorage/materialStorageAddress",
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -223,6 +242,17 @@
       },
     },
     methods: {
+      handleExpressBlur(value) {
+        this.handleExpressChange(value);
+      },
+      handleExpressSearch(value) {
+        this.handleExpressChange(value);
+      },
+      handleExpressChange(value) {
+        console.log(value);
+        // JeecgListMixin.queryParam.inventoryAddress = value;
+        // this.getExpress({ name: value });
+      },
       initDictConfig(){
       },
       getSuperFieldList(){
@@ -234,7 +264,14 @@
         fieldList.push({type:'string',value:'unit',text:'单位',dictCode:''})
         fieldList.push({type:'int',value:'delFlag',text:'删除标志',dictCode:''})
         fieldList.push({type:'date',value:'delTime',text:'删除时间'})
-        this.superFieldList = fieldList
+        this.superFieldList = fieldList;
+        getAction(this.url.addressUrl,null).then((res)=>{
+          if(res.success){
+            // console.log(res.result);
+            this.bigId = res.result;
+          }
+        });
+
       }
     }
   }
diff --git a/src/views/materialstorage/modules/ProcessMaterialStorageForm.vue b/src/views/materialstorage/modules/ProcessMaterialStorageForm.vue
index 2d0e9aa..5f53bce 100644
--- a/src/views/materialstorage/modules/ProcessMaterialStorageForm.vue
+++ b/src/views/materialstorage/modules/ProcessMaterialStorageForm.vue
@@ -4,40 +4,46 @@
       <a-form :form="form" slot="detail">
         <a-row>
           <a-col :span="8">
-            <a-form-item label="供应商ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['supplierId']" placeholder="请输入供应商ID"  ></a-input>
+            <a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['supplierId']" placeholder="请输入供应商"  ></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="物料详情ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['merchandiseNewsId']" placeholder="请输入物料详情ID"  ></a-input>
+            <a-form-item label="物料描述" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['merchandiseNewsId']" placeholder="请输入物料详情"  ></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="品名类ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['descriptionId']" placeholder="请输入品名类ID"  ></a-input>
+            <a-form-item label="物料组名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['descriptionId']" placeholder="请输入品名类"  ></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="库存地点" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['inventoryAddress']" placeholder="请输入库存地点"  ></a-input>
+<!--              <a-input v-decorator="['inventoryAddress']" placeholder="请输入库存地点"  ></a-input>-->
+              <a-select  placeholder="请选择库存地点" v-decorator="['inventoryAddress']">
+                <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.id">{{item.supplierName}}</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['unit']" placeholder="请输入单位"  ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="删除标志" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number v-decorator="['delFlag']" placeholder="请输入删除标志" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="删除时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择删除时间" v-decorator="['delTime']" :trigger-change="true" style="width: 100%" />
+<!--              <a-input v-decorator="['unit']" placeholder="请输入单位"  ></a-input>-->
+              <a-select  placeholder="请选择库存地点" v-decorator="['unit']">
+                <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.id">{{item.supplierName}}</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
+<!--          <a-col :span="8">-->
+<!--            <a-form-item label="删除标志" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-input-number v-decorator="['delFlag']" placeholder="请输入删除标志" style="width: 100%" />-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="8">-->
+<!--            <a-form-item label="删除时间" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <j-date placeholder="请选择删除时间" v-decorator="['delTime']" :trigger-change="true" style="width: 100%" />-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
           <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
             <a-button @click="submitForm">提 交</a-button>
           </a-col>
@@ -53,7 +59,7 @@
   import pick from 'lodash.pick'
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jeecg/JFormContainer'
-  import JDate from '@/components/jeecg/JDate'  
+  import JDate from '@/components/jeecg/JDate'
 
   export default {
     name: 'ProcessMaterialStorageForm',
@@ -84,10 +90,11 @@
     data () {
       return {
         form: this.$form.createForm(this),
+        bigId:[],
         model: {},
         labelCol: {
           xs: { span: 24 },
-          sm: { span: 5 },
+          sm: { span: 6 },
         },
         wrapperCol: {
           xs: { span: 24 },
@@ -177,7 +184,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
       popupCallback(row){
diff --git a/src/views/merchandisenews/ProcessMerchandiseNewsList.vue b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue
index 737df14..bc48bb8 100644
--- a/src/views/merchandisenews/ProcessMerchandiseNewsList.vue
+++ b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue
@@ -44,10 +44,10 @@
             <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>
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
             </span>
           </a-col>
         </a-row>
@@ -63,7 +63,7 @@
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <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>
diff --git a/src/views/statisticanalysis/CostStatistic.vue b/src/views/statisticanalysis/CostStatistic.vue
index 368cf5f..84ef92e 100644
--- a/src/views/statisticanalysis/CostStatistic.vue
+++ b/src/views/statisticanalysis/CostStatistic.vue
@@ -1,6 +1,6 @@
 <template>
   <!--  <div>成本统计</div>-->
-  <div style="height: 950px;display: flex;align-items: center;justify-content: flex-start;background-color: black">
+  <div style="height: 950px;display: flex;align-items: center;justify-content: flex-start;background-color: #ececec">
     <div style="height: 100%;width:35%;">
       <div style="height: 23%;">
         <OnDayCost/>
diff --git a/src/views/statisticanalysis/costecharts/CaseCost.vue b/src/views/statisticanalysis/costecharts/CaseCost.vue
index b046d0b..3b295ac 100644
--- a/src/views/statisticanalysis/costecharts/CaseCost.vue
+++ b/src/views/statisticanalysis/costecharts/CaseCost.vue
@@ -2,7 +2,8 @@
 <!--  <div>项目成本情况</div>-->
   <div style="width: 100%;height:100% ">
       <div style="height: 20%;margin-left: 4%">
-        <div style="color: #ffffff;font-size: 19px;margin-bottom: 5px">项目部成本情况</div>
+        <div style="font-size: 19px;margin-bottom: 5px">项目部成本情况</div>
+<!--        <div style="color: #ffffff;font-size: 19px;margin-bottom: 5px">项目部成本情况</div>-->
         <div style="display: flex;align-items: center;justify-content: flex-start">
           <div class="xian">第一项目部</div>
           <div class="xian">第二项目部</div>
@@ -127,7 +128,7 @@ export default {
           // show: false,
           axisLine: {
             lineStyle: {
-              color: '#f5f5f6', //x轴的颜色
+              color: '#000000', //x轴的颜色
               // width: 8, //轴线的宽度
             },
 
@@ -137,7 +138,7 @@ export default {
           type: 'value',
           axisLine: {
             lineStyle: {
-              color: '#f5f5f6', //x轴的颜色
+              color: '#000000', //x轴的颜色
               // width: 8, //轴线的宽度
             },
           },
@@ -189,7 +190,7 @@ export default {
           // show: false,
           axisLine: {
             lineStyle: {
-              color: '#f5f5f6', //x轴的颜色
+              color: '#000000', //x轴的颜色
               // width: 8, //轴线的宽度
             },
 
@@ -199,7 +200,7 @@ export default {
           type: 'value',
           axisLine: {
             lineStyle: {
-              color: '#f5f5f6', //x轴的颜色
+              color: '#000000', //x轴的颜色
               // width: 8, //轴线的宽度
             },
           },
@@ -251,7 +252,7 @@ export default {
           // show: false,
           axisLine: {
             lineStyle: {
-              color: '#f5f5f6', //x轴的颜色
+              color: '#000000', //x轴的颜色
               // width: 8, //轴线的宽度
             },
 
@@ -261,7 +262,7 @@ export default {
           type: 'value',
           axisLine: {
             lineStyle: {
-              color: '#f5f5f6', //x轴的颜色
+              color: '#000000', //x轴的颜色
               // width: 8, //轴线的宽度
             },
           },
@@ -306,7 +307,7 @@ export default {
   text-align: center;
 }
 .mu{
-  color:beige;
+  color: #151513;
   width: 92%;
   /*border: 1px solid #ff00ff;*/
   height: 100%;
@@ -317,10 +318,10 @@ export default {
 .dui{
   width: 33%;
   height: 100%;
-  border: 1px solid #d1e9ff;
+  border: 1px solid #000000;
 }
 .yi{
-  border-bottom:1px solid #ffffff;
+  border-bottom:1px solid #000000;
   padding-left: 3%;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/statisticanalysis/costecharts/Cost.vue b/src/views/statisticanalysis/costecharts/Cost.vue
index 0bfa076..f8ef242 100644
--- a/src/views/statisticanalysis/costecharts/Cost.vue
+++ b/src/views/statisticanalysis/costecharts/Cost.vue
@@ -1,7 +1,8 @@
 <template>
   <div style="width: 100%;height:100% ">
     <div style="height: 30%;margin-left: 6%">
-      <div style="color: #ffffff;font-size: 19px;margin-bottom: 5px">公司成本</div>
+      <div style="font-size: 19px;margin-bottom: 5px">公司成本</div>
+<!--      <div style="color: #ffffff;font-size: 19px;margin-bottom: 5px">公司成本</div>-->
       <div style="display: flex;align-items: center;justify-content: flex-start">
         <div class="xian">月</div>
         <div class="xian">季度</div>
@@ -65,7 +66,7 @@ name: "Cost",
           data: ["1","2","3","4","5","6","7","8","9","10","11","12"],
           axisLine: {
             lineStyle: {
-              color: '#f5f5f6', //x轴的颜色
+              color: '#000000', //x轴的颜色
               // width: 8, //轴线的宽度
             },
 
@@ -74,7 +75,7 @@ name: "Cost",
         yAxis: {
           axisLine: {
             lineStyle: {
-              color: '#f5f5f6', //x轴的颜色
+              color: '#000000', //x轴的颜色
               // width: 8, //轴线的宽度
             },
 
diff --git a/src/views/statisticanalysis/costecharts/CostAnalysis.vue b/src/views/statisticanalysis/costecharts/CostAnalysis.vue
index 0197f35..a99e53a 100644
--- a/src/views/statisticanalysis/costecharts/CostAnalysis.vue
+++ b/src/views/statisticanalysis/costecharts/CostAnalysis.vue
@@ -1,6 +1,6 @@
 <template>
 <!--  <div>成本分析</div>-->
-  <div style="width: 100%;height: 100%;padding-top: 2%;border-radius:15px;background-color: #555252;">
+  <div style="width: 100%;height: 100%;padding-top: 2%;border-radius:15px;background-color: #9c9a9a;">
     <div style="height: 30%;margin-left: 1%;width: 100%">
       <div style="color: #ffffff;font-size: 19px;margin-bottom: 5px">分析成本</div>
       <div style="display: flex;align-items: center;justify-content: space-between;margin-left: 5%;width: 90%">
diff --git a/src/views/statisticanalysis/costecharts/ItemCost.vue b/src/views/statisticanalysis/costecharts/ItemCost.vue
index 4cabe59..2fb9928 100644
--- a/src/views/statisticanalysis/costecharts/ItemCost.vue
+++ b/src/views/statisticanalysis/costecharts/ItemCost.vue
@@ -2,7 +2,8 @@
   <!--  <div>项目成本</div>-->
   <div style="width: 100%;height:100% ">
     <div style="height: 30%;margin-left: 6%">
-      <div style="color: #ffffff;font-size: 19px;margin-bottom: 5px">项目部成本</div>
+      <div style="font-size: 19px;margin-bottom: 5px">项目部成本</div>
+<!--      <div style="color: #ffffff;font-size: 19px;margin-bottom: 5px">项目部成本</div>-->
       <div style="display: flex;align-items: center;justify-content: flex-start">
         <div class="xian">月</div>
         <div class="xian">季度</div>
@@ -63,7 +64,7 @@ export default {
           // show: false,
           axisLine: {
             lineStyle: {
-              color: '#f5f5f6', //x轴的颜色
+              color: '#070707', //x轴的颜色
               // width: 8, //轴线的宽度
             },
 
@@ -73,7 +74,7 @@ export default {
           type: 'value',
           axisLine: {
             lineStyle: {
-              color: '#f5f5f6', //x轴的颜色
+              color: '#050505', //x轴的颜色
               // width: 8, //轴线的宽度
             },
           },
diff --git a/src/views/statisticanalysis/costecharts/OnDayCost.vue b/src/views/statisticanalysis/costecharts/OnDayCost.vue
index 7917a88..8527d00 100644
--- a/src/views/statisticanalysis/costecharts/OnDayCost.vue
+++ b/src/views/statisticanalysis/costecharts/OnDayCost.vue
@@ -3,10 +3,12 @@
   <div style=" width: 95%;height: 100%;">
     <div style=" width: 100%;height: 28%;display: flex;align-items: center;justify-content:flex-start;padding-left: 8%">
       <div style="">
-        <div style="color: #ffffff;font-size: 19px">
+        <div style="font-size: 19px">
+<!--        <div style="color: #ffffff;font-size: 19px">-->
           当日成本
         </div>
-        <span style="color: #ffffff">元</span>
+        <span style="">元</span>
+<!--        <span style="color: #ffffff">元</span>-->
       </div>
       <div style="flex: 1;display: flex;align-items: center;justify-content: space-evenly;height: 80px;margin-top: 5%;width: 50% ">
         <div class="wen" >1</div>
@@ -108,7 +110,7 @@ name: "OnDayCost",
                 // color: '#7b7777', //改变折线点的颜色
                 color:new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
                   offset: 0,
-                  color: '#d4d4d4'
+                  color: '#1a1717'
                 }, {
                   offset: 1,
                   color: 'rgba(76,77,80,0.1)'
diff --git a/src/views/supplier/ProcessSupplierList.vue b/src/views/supplier/ProcessSupplierList.vue
index d87eb53..dba7cf4 100644
--- a/src/views/supplier/ProcessSupplierList.vue
+++ b/src/views/supplier/ProcessSupplierList.vue
@@ -4,6 +4,37 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="供应商编码">
+              <a-input placeholder="请输入供应商编码" v-model="queryParam.coding"></a-input>
+            </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.supplierName"></a-input>
+            </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.rank"></a-input>-->
+                <a-select v-model="queryParam.rank" placeholder="请选择级别" >
+                  <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.rank">{{item.rank}}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+<!--          <template v-if="toggleSearchStatus">-->
+<!--          </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>
@@ -16,22 +47,22 @@
       <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-upload
-        name="file"
-        :multiple="false"
-        :action="minioUploadAction"
-        :headers="tokenHeader"
-        :showUploadList="false"
-        :beforeUpload="beforeUpload"
-        @change="handleChange">
-        <a-button>
-          <a-icon type="upload"/>
-          MINIO上传签名照
-        </a-button>
-      </a-upload>
+<!--      <a-upload-->
+<!--        name="file"-->
+<!--        :multiple="false"-->
+<!--        :action="minioUploadAction"-->
+<!--        :headers="tokenHeader"-->
+<!--        :showUploadList="false"-->
+<!--        :beforeUpload="beforeUpload"-->
+<!--        @change="handleChange">-->
+<!--        <a-button>-->
+<!--          <a-icon type="upload"/>-->
+<!--          MINIO上传签名照-->
+<!--        </a-button>-->
+<!--      </a-upload>-->
 
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <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>
@@ -115,6 +146,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ProcessSupplierModal from './modules/ProcessSupplierModal'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import { getAction } from '@api/manage'
 
 
 
@@ -128,6 +160,7 @@
     data () {
       return {
         fileList: [],
+        bigId:[],
         headers: {
           authorization: 'authorization-text',
         },
@@ -158,16 +191,16 @@
             title:'级别',
             align:"center",
             dataIndex: 'rank',
-            customRender:function (t,r,index) {
-              // console.log(t,r,index);
-              let name = '';
-              if(r.rank === 0){
-                name = "一级物资供应商";
-              }else if(r.rank === 1){
-                name = "非集中采购物资供应商";
-              }
-              return name;
-            }
+            // customRender:function (t,r,index) {
+            //   // console.log(t,r,index);
+            //   let name = '';
+            //   if(r.rank === 0){
+            //     name = "一级物资供应商";
+            //   }else if(r.rank === 1){
+            //     name = "非集中采购物资供应商";
+            //   }
+            //   return name;
+            // }
           },
           {
             title:'状态',
@@ -204,7 +237,8 @@
           deleteBatch: "/supplier/processSupplier/deleteBatch",
           exportXlsUrl: "/supplier/processSupplier/exportXls",
           importExcelUrl: "supplier/processSupplier/importExcel",
-          minioUpload: "/sys/upload/uploadMinio"
+          minioUpload: "/sys/upload/uploadMinio",
+          supplierRake: "/supplier/processSupplier/supplierRake",
 
         },
         dictOptions:{},
@@ -260,7 +294,13 @@
         fieldList.push({type:'int',value:'rank',text:'级别',dictCode:''})
         fieldList.push({type:'int',value:'state',text:'状态',dictCode:''})
         fieldList.push({type:'int',value:'delFlag',text:'删除标志',dictCode:''})
-        this.superFieldList = fieldList
+        this.superFieldList = fieldList;
+        getAction(this.url.supplierRake,null).then((res)=>{
+          if(res.success){
+            // console.log(res.result);
+            this.bigId =  res.result;
+          }
+        });
       }
     }
   }
diff --git a/src/views/supplier/modules/ProcessSupplierForm.vue b/src/views/supplier/modules/ProcessSupplierForm.vue
index 255b52a..f2202a1 100644
--- a/src/views/supplier/modules/ProcessSupplierForm.vue
+++ b/src/views/supplier/modules/ProcessSupplierForm.vue
@@ -16,7 +16,10 @@
           <a-col :span="8">
             <a-form-item label="级别" :labelCol="labelCol" :wrapperCol="wrapperCol">
 <!--              <a-input-number v-decorator="['rank']" placeholder="请输入级别" style="width: 100%" />-->
-              <j-dict-select-tag type="list" v-decorator="['rank']" :trigger-change="true" placeholder="请输入级别" dictCode="supplier_type" />
+<!--              <j-dict-select-tag type="list" v-decorator="['rank']" :trigger-change="true" placeholder="请输入级别" dictCode="supplier_type" />-->
+              <a-select v-decorator="['rank']" placeholder="请选择级别" >
+                <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.rank">{{item.rank}}</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :span="8">
@@ -76,6 +79,7 @@
       return {
         form: this.$form.createForm(this),
         model: {},
+        bigId:[],
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -89,8 +93,10 @@
         },
         url: {
           add: "/supplier/processSupplier/add",
+          supplierRake: "/supplier/processSupplier/supplierRake",
           edit: "/supplier/processSupplier/edit",
           queryById: "/supplier/processSupplier/queryById"
+
         }
       }
     },
@@ -137,11 +143,11 @@
             }else{
               this.model.state = "停用"
             }
-            if(this.model.rank === 0){
-              this.model.rank = "一级物资供应商";
-            }else{
-              this.model.rank = "非集中采购物资供应商"
-            }
+            // if(this.model.rank === 0){
+            //   this.model.rank = "一级物资供应商";
+            // }else{
+            //   this.model.rank = "非集中采购物资供应商"
+            // }
           }
           this.form.setFieldsValue(pick(this.model,'coding','supplierName','rank','state','delFlag'))
         })
@@ -155,7 +161,14 @@
               this.edit (res.result);
             }
           });
+
         }
+        getAction(this.url.supplierRake,null).then((res)=>{
+          if(res.success){
+            // console.log(res.result);
+            this.bigId =  res.result;
+          }
+        });
       },
       submitForm () {
         const that = this;
@@ -179,11 +192,11 @@
             }else if(formData.state === "冻结"){
               formData.state = "1"
             }
-            if(formData.rank === "一级物资供应商"){
-              formData.rank = "0";
-            }else if(formData.rank === "非集中采购物资供应商"){
-              formData.rank = "1"
-            }
+            // if(formData.rank === "一级物资供应商"){
+            //   formData.rank = "0";
+            // }else if(formData.rank === "非集中采购物资供应商"){
+            //   formData.rank = "1"
+            // }
             console.log("表单提交数据",formData)
             httpAction(httpurl,formData,method).then((res)=>{
               if(res.success){
diff --git a/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue b/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
index 2210884..9517470 100644
--- a/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
+++ b/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
@@ -11,24 +11,25 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="账外物资编码">
-              <a-input placeholder="请输入账外物资编码" v-model="queryParam.invisibleCode"></a-input>
+              <a-input placeholder="请输入账外物资编码" v-model="queryParam.libraryAssociationIdInvisible"></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.wasteCode"></a-input>
+                <a-input placeholder="请输入废旧物资编码" v-model="queryParam.libraryAssociationIdWaste"></a-input>
               </a-form-item>
             </a-col>
+          <template v-if="toggleSearchStatus">
           </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>
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
             </span>
           </a-col>
         </a-row>
@@ -44,7 +45,7 @@
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <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>
@@ -101,9 +102,9 @@
           <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 @click="handleDetail(record)">详情</a>-->
+<!--              </a-menu-item>-->
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
@@ -158,12 +159,12 @@
           {
             title:'账外物资编码',
             align:"center",
-            dataIndex: 'invisibleCode'
+            dataIndex: 'libraryAssociationIdInvisible'
           },
           {
             title:'废旧物资编码',
             align:"center",
-            dataIndex: 'wasteCode'
+            dataIndex: 'libraryAssociationIdWaste'
           },
           {
             title:'备注',
@@ -205,8 +206,8 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'unit',text:'单位',dictCode:''})
-        fieldList.push({type:'string',value:'invisibleCode',text:'账外物资编码',dictCode:''})
-        fieldList.push({type:'string',value:'wasteCode',text:'废旧物资编码',dictCode:''})
+        fieldList.push({type:'string',value:'libraryAssociationIdInvisible',text:'账外物资编码',dictCode:''})
+        fieldList.push({type:'string',value:'libraryAssociationIdWaste',text:'废旧物资编码',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
         this.superFieldList = fieldList
       }
diff --git a/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeForm.vue b/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeForm.vue
index cc8acde..eb1cbea 100644
--- a/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeForm.vue
+++ b/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeForm.vue
@@ -10,17 +10,17 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="账外物资编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['invisibleCode']" placeholder="请输入账外物资编码"  ></a-input>
+              <a-input v-decorator="['libraryAssociationIdInvisible']" placeholder="请输入账外物资编码"  ></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="废旧物资编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['wasteCode']" placeholder="请输入废旧物资编码"  ></a-input>
+              <a-input v-decorator="['libraryAssociationIdWaste']" placeholder="请输入废旧物资编码"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
-            <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['remark']" placeholder="请输入备注"  ></a-input>
+          <a-col :span="24">
+            <a-form-item label="备注" :labelCol="labelCols" :wrapperCol="wrapperCols">
+              <a-textarea v-decorator="['remark']" placeholder="请输入备注"  :auto-size="{ minRows: 5, maxRows: 7 }" ></a-textarea>
             </a-form-item>
           </a-col>
           <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
@@ -70,11 +70,19 @@
         model: {},
         labelCol: {
           xs: { span: 24 },
-          sm: { span: 5 },
+          sm: { span: 6 },
+        },
+        labelCols: {
+          xs: { span: 24 },
+          sm: { span: 2 },
+        },
+        wrapperCols: {
+          xs: { span: 24 },
+          sm: { span: 21},
         },
         wrapperCol: {
           xs: { span: 24 },
-          sm: { span: 16 },
+          sm: { span: 15 },
         },
         confirmLoading: false,
         validatorRules: {
@@ -118,7 +126,7 @@
         this.model = Object.assign({}, record);
         this.visible = true;
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'unit','invisibleCode','wasteCode','remark'))
+          this.form.setFieldsValue(pick(this.model,'unit','libraryAssociationIdInvisible','libraryAssociationIdWaste','remark'))
         })
       },
       //渲染流程表单数据
@@ -160,11 +168,11 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
       popupCallback(row){
-        this.form.setFieldsValue(pick(row,'unit','invisibleCode','wasteCode','remark'))
+        this.form.setFieldsValue(pick(row,'unit','libraryAssociationIdInvisible','libraryAssociationIdWaste','remark'))
       },
     }
   }
diff --git a/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeModal.vue b/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeModal.vue
index aa38ad1..6262261 100644
--- a/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeModal.vue
+++ b/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeModal.vue
@@ -23,7 +23,7 @@
     data () {
       return {
         title:'',
-        width:1024,
+        width:1224,
         visible: false,
         disableSubmit: false
       }