From cc1d12a83d832f04f4f365e35e5b846efe057ed4 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Tue, 16 May 2023 10:50:27 +0800
Subject: [PATCH] 2023-5-16 1111

---
 .../src/api/supplier/supplier.js              |  15 +-
 .../src/layout/components/Navbar.vue          |   2 +-
 .../src/layout/components/Sidebar/index.vue   |   2 +-
 .../yxt-supervise-cyf-ui/src/router/index.js  |   2 +-
 .../inventory/oilTypeInBoundList/index.vue    |   6 +-
 .../views/supervise/oilTypeInBound/index.vue  | 138 +++++++++++-------
 6 files changed, 104 insertions(+), 61 deletions(-)

diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/supplier/supplier.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/supplier/supplier.js
index 5c3f275b..50fac6ce 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/supplier/supplier.js
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/supplier/supplier.js
@@ -22,7 +22,7 @@ export default {
     });
   },
 
- 
+
   fetchBySid: function(sid) {
     return request({
       url: '/cyf/supplier/getSupplierBySid/' + sid
@@ -44,5 +44,16 @@ export default {
     })
   },
 
- 
+  // 供应商 数据字典
+  supplierList: function(params) {
+    return request({
+      url: '/cyf/supplier/supplierList',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Navbar.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Navbar.vue
index f8f80139..a15bb217 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Navbar.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="navbar">
-     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>醇油坊进销存管理平台</p>
+     <p class="breadcrumb-container"><img src="@/assets/loginImg/cyf_logo.jpg" style="width: 45px;height: 45px;margin-right: 10px;"/>醇油坊进销存管理平台</p>
      <!-- <h3 class="breadcrumb-container">汇融银行供应链贷后监管平台</h3> -->
       <div class="right-menu">
 <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue
index 0231a633..70bce73e 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue
@@ -45,7 +45,7 @@
             component: 'supervise',
             meta: {
               icon: "el-icon-menu",
-              title: "监管操作"
+              title: "库房登记"
             },
             name: "",
             path: "/supervise",
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js
index 3a12984b..85eee04e 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js
@@ -111,7 +111,7 @@ export const constantRoutes = [{
     component: Layout,
     redirect: null,
     meta: {
-      title: '监管操作'
+      title: '库房登记'
     },
     children: [{
         path: '/supervise/recordOilTank',
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue
index 83fe51c6..c836b632 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue
@@ -28,12 +28,12 @@
           <el-table v-loading="tableLoading1" :data="logList" border style="width: 100%">
             <el-table-column fixed width="100" type="index" label="序号" :index="indexMethod" align="center" />
             <el-table-column prop="contractNumber" label="合同编号" align="center" />
-            <el-table-column prop="supplierSid" label="供货商" width="150" align="center" />
+            <el-table-column prop="supplierName" label="供货商" width="150" align="center" />
             <el-table-column prop="contractSigningDate" label="合同日期" width="150" align="center" />
             <el-table-column prop="licensePlateNumber" label="发货车牌号" width="150" align="center" />
             <el-table-column prop="warehousingDate" label="入库日期" width="150" align="center" />
-               <el-table-column prop="crudeName" label="原油名称" width="150" align="center" />
-               <el-table-column prop="crudeNumber" label="原油编码" width="150" align="center" />
+            <el-table-column prop="crudeName" label="原油名称" width="150" align="center" />
+            <el-table-column prop="crudeNumber" label="原油编码" width="150" align="center" />
             <el-table-column prop="tankNumber" label="油罐编号" width="150" align="center" />
             <el-table-column prop="weight" label="收料净重" width="150" align="center" />
             <el-table-column prop="value" label="收料价值" width="150" align="center" />
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeInBound/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeInBound/index.vue
index aee8b311..7abb9fb3 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeInBound/index.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeInBound/index.vue
@@ -21,8 +21,11 @@
           <el-input v-model="formobj.contractNumber" placeholder="" class="item_input" clearable />
         </div>
         <div class="item">
-          <span class="item_text">供货商：</span>
-          <el-input v-model="formobj.supplierSid" placeholder="" class="item_input" clearable />
+          <span class="item_text">供货商名称：</span>
+          <el-select v-model="formobj.supplierName" filterable placeholder="请选择供货商名称" class="item_input"
+            @change="getSupplier">
+            <el-option v-for="item in supplierList" :key="item.sid" :label="item.name" :value="item.sid" />
+          </el-select>
         </div>
         <div class="item">
           <span class="item_text">合同日期：</span>
@@ -38,18 +41,18 @@
           <el-date-picker v-model="formobj.warehousingDate" type="date" format="yyyy-MM-dd" class="item_input"
             value-format="yyyy-MM-dd" placeholder="请选择" />
         </div>
-       <div class="item">
-         <span class="item_text">原油名称：</span>
-         <el-select v-model="formobj.crudeName" filterable placeholder="请选择原油名称" class="item_input" @change="getType">
-           <el-option v-for="item in crudeList" :key="item.sid" :label="item.name" :value="item.sid" />
-         </el-select>
-         <!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> -->
-       </div>
-       <div class="item">
-         <span class="item_text">原油编号：</span>
-         <el-input v-model="formobj.crudeNumber" placeholder="" :readonly="true" class="item_input" clearable />
-         <!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
-       </div>
+        <div class="item">
+          <span class="item_text">原油名称：</span>
+          <el-select v-model="formobj.crudeName" filterable placeholder="请选择原油名称" class="item_input" @change="getType">
+            <el-option v-for="item in crudeList" :key="item.sid" :label="item.name" :value="item.sid" />
+          </el-select>
+          <!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> -->
+        </div>
+        <div class="item">
+          <span class="item_text">原油编号：</span>
+          <el-input v-model="formobj.crudeNumber" placeholder="" :readonly="true" class="item_input" clearable />
+          <!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
+        </div>
         <div class="item">
           <span class="item_text">油罐编号：</span>
           <el-select v-model="formobj.tankName" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
@@ -72,7 +75,7 @@
         </div>
         <div class="item" style="margin-top: 70px;">
           <span class="item_text">登记材料：</span>
-          <upload class="item_input" ref="uploadImg" v-model="imgList"  @change="backData" bucket="map"
+          <upload class="item_input" ref="uploadImg" v-model="imgList" @change="backData" bucket="map"
             :upload-data="{ type: '0001' }"></upload>
 
         </div>
@@ -85,7 +88,7 @@
 
 <script>
   import req from '@/api/oilTypeInAndOutBound/oilTypeInAndOutBound'
-  import req2 from '@/api/oilTank/oilTank'
+  import req3 from '@/api/supplier/supplier'
   import upload from '@/components/uploadFile/upload_yanchejianchaTuBiao'
   export default {
     components: {
@@ -94,6 +97,8 @@
     data() {
       return {
         submitdisabled: false,
+        supplierLists: [],
+        supplierList: [],
         crudeLists: [],
         crudeList: [],
         tankLists: [],
@@ -112,41 +117,61 @@
           weight: "",
           value: "",
           supplierSid: "",
+          supplierName: "",
           licensePlateNumber: "",
           remarks: "",
-          crudeOilStorageFile:[],
+          crudeOilStorageFile: [],
 
         }
       }
     },
     created() {
+      this.supplierInfoList()
       this.crudeinfoList()
     },
     methods: {
-     crudeinfoList() {
-       req.crudeinfoList().then((res) => {
-         if (res.success) {
-           console.log(">>>>>>>>>2222222", res.data)
-           this.crudeLists = res.data
-           for (var i = 0; i < this.crudeLists.length; i++) {
-
-             let item = {
-               name: this.crudeLists[i].name,
-               sid: this.crudeLists[i].sid,
-
-             }
-             this.crudeList.push(item)
-           }
-
-         }
-       })
-     },
+      supplierInfoList() {
+        req3.supplierList().then((res) => {
+          if (res.success) {
+            console.log(">>>>>>>>>2222222", res.data)
+            this.supplierLists = res.data
+            for (var i = 0; i < this.supplierLists.length; i++) {
+
+              let item = {
+                name: this.supplierLists[i].supplierName,
+                sid: this.supplierLists[i].sid,
+
+              }
+              this.supplierList.push(item)
+            }
+
+          }
+        })
+      },
+      crudeinfoList() {
+        req.crudeinfoList().then((res) => {
+          if (res.success) {
+            console.log(">>>>>>>>>2222222", res.data)
+            this.crudeLists = res.data
+            for (var i = 0; i < this.crudeLists.length; i++) {
+
+              let item = {
+                name: this.crudeLists[i].name,
+                sid: this.crudeLists[i].sid,
+
+              }
+              this.crudeList.push(item)
+            }
+
+          }
+        })
+      },
       getTankList(sid) {
         req.tankLisBySid(sid).then((res) => {
           if (res.success) {
             console.log(">>>>>>>>>111111111111wwwwwwwwww", res.data)
             this.tankLists = res.data
-              this.tankList =[]
+            this.tankList = []
             for (var i = 0; i < this.tankLists.length; i++) {
 
               let item = {
@@ -170,21 +195,21 @@
                 message: resp.msg
               })
               this.formobj = {
-               sid: "",
-               contractNumber: "",
-               contractSigningDate: "",
-               warehousingDate: "",
-               crudeSid: "",
-               crudeName: "",
-               crudeNumber: "",
-               tankName: "",
-               tankSid: "",
-               weight: "",
-               value: "",
-               supplierSid: "",
-               licensePlateNumber: "",
-               remarks: "",
-               crudeOilStorageFile:[],
+                sid: "",
+                contractNumber: "",
+                contractSigningDate: "",
+                warehousingDate: "",
+                crudeSid: "",
+                crudeName: "",
+                crudeNumber: "",
+                tankName: "",
+                tankSid: "",
+                weight: "",
+                value: "",
+                supplierSid: "",
+                licensePlateNumber: "",
+                remarks: "",
+                crudeOilStorageFile: [],
 
               }
               this.imgList = []
@@ -199,14 +224,21 @@
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
       },
+      getSupplier(value) {
+        console.log(">>>>>>>>>getType", value)
+        const choose = this.supplierLists.filter((item) => item.sid === value)
+        console.log(">>>>>>>>>getType", choose[0])
+        this.formobj.supplierName = choose[0].supplierName
+        this.formobj.supplierSid = value
+      },
       getType(value) {
         console.log(">>>>>>>>>getType", value)
         const choose = this.crudeLists.filter((item) => item.sid === value)
         console.log(">>>>>>>>>getType", choose[0])
         this.formobj.crudeNumber = choose[0].number
         this.formobj.crudeSid = value
-       
-          this.getTankList(value)
+
+        this.getTankList(value)
       },
       getTank(value) {
         console.log(">>>>>>>>>getType", value)