Browse Source

修改问题

qukaidi 4 years ago
parent
commit
03f2b9f4f3

+ 41 - 13
src/views/index.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="app-container home">
   <div class="app-container home">
     <div v-if="sysType == 1">
     <div v-if="sysType == 1">
-      <div style="display: flex;margin-bottom: 40px;">
+      <div style="display: flex; margin-bottom: 40px">
         <div style="width: 70%">
         <div style="width: 70%">
           <ul class="block" v-if="sysType == 1">
           <ul class="block" v-if="sysType == 1">
             <li @click="jump('/business/inStock')">
             <li @click="jump('/business/inStock')">
@@ -120,7 +120,7 @@
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
-      <div style="display: flex;margin-bottom: 40px;">
+      <div style="display: flex; margin-bottom: 40px">
         <div style="width: 70%">
         <div style="width: 70%">
           <div>
           <div>
             <div
             <div
@@ -141,7 +141,9 @@
               <div class="home_stock_table">业务类型</div>
               <div class="home_stock_table">业务类型</div>
               <div class="home_stock_table_right">
               <div class="home_stock_table_right">
                 <div>操作</div>
                 <div>操作</div>
-                <el-link type="primary" @click="jump('/morePage/stock')">更多></el-link>
+                <el-link type="primary" @click="jump('/morePage/stock')"
+                  >更多></el-link
+                >
               </div>
               </div>
             </div>
             </div>
             <div v-if="tableData.length > 0">
             <div v-if="tableData.length > 0">
@@ -154,13 +156,27 @@
                 v-for="(item, index) in tableData"
                 v-for="(item, index) in tableData"
                 :key="index"
                 :key="index"
               >
               >
-                <div class="home_stock_table">{{ item.refno1 }}</div>
+                <div class="home_stock_table"> <p>{{ item.refno1 }}</p></div>
                 <div class="home_stock_table">
                 <div class="home_stock_table">
                   {{ item.auditItem }}
                   {{ item.auditItem }}
                 </div>
                 </div>
-                <div class="home_stock_table">{{ item.refno3 }}</div>
-                <div class="home_stock_table">{{ item.refno2 }}</div>
-                <div class="home_stock_table">操作</div>
+                <div class="home_stock_table"><p>{{ item.refno1 }}</p></div>
+                <div class="home_stock_table">
+                  <span v-if="item.refno2 === 'SJRK'">入库</span>
+                  <span v-else-if="item.refno2 === 'SJCK'">出库</span>
+                  <span v-else-if="item.refno2 === 'HQZY'">货转</span>
+                  <span v-else-if="item.refno2 === 'CKDB'">调拨</span>
+                  <span v-else-if="item.refno2 === 'CCF'">仓储费</span>
+                  <span v-else-if="item.refno2 === 'HWTG'">货物通关</span>
+                  <span v-else-if="item.refno2 === 'ZYF'">作业费</span>
+                  <span v-else-if="item.refno2 === 'SF'">收费</span>
+                  <span v-else-if="item.refno2 === 'DZ'">对账</span>
+                  <span v-else-if="item.refno2 === 'FF'">付费</span>
+                  <span v-else-if="item.refno2 === 'JSCCF'">计算仓储费</span>
+                </div>
+                <div class="home_stock_table" @click="approval(item.refno2)">
+                  查看详情
+                </div>
               </div>
               </div>
             </div>
             </div>
             <div
             <div
@@ -254,7 +270,7 @@
           </el-table>
           </el-table>
         </div>
         </div>
       </div>
       </div>
-      <div style="display: flex;">
+      <div style="display: flex">
         <div style="width: 70%">
         <div style="width: 70%">
           <div
           <div
             id="commoDity"
             id="commoDity"
@@ -683,7 +699,7 @@ export default {
     },
     },
     //跳转审批页面
     //跳转审批页面
     approval(row) {
     approval(row) {
-      switch (row.refno2) {
+      switch (row) {
         case "SJRK": {
         case "SJRK": {
           this.$router.push({
           this.$router.push({
             path: "/business/inStock",
             path: "/business/inStock",
@@ -771,6 +787,11 @@ export default {
         actId: "",
         actId: "",
       };
       };
       inquiry(data).then((res) => {
       inquiry(data).then((res) => {
+        res.data.map(e=>{
+          if(e.auditItem){
+            e.auditItem=e.auditItem.slice(0, 10)
+          }
+        })
         this.tableData = res.data;
         this.tableData = res.data;
       });
       });
     },
     },
@@ -887,9 +908,9 @@ export default {
     getList() {
     getList() {
       this.loading = true;
       this.loading = true;
       listCorps(this.queryParams).then((response) => {
       listCorps(this.queryParams).then((response) => {
-        if(response.rows.length>0){
+        if (response.rows.length > 0) {
           this.tableDataTwo = response.rows.slice(0, 10);
           this.tableDataTwo = response.rows.slice(0, 10);
-        } 
+        }
       });
       });
     },
     },
     //查询仓库
     //查询仓库
@@ -1268,7 +1289,7 @@ export default {
     padding: 10px;
     padding: 10px;
     justify-content: space-between;
     justify-content: space-between;
   }
   }
-  .content-bottom:last-child{
+  .content-bottom:last-child {
     border-bottom: 0px;
     border-bottom: 0px;
   }
   }
   .upper-right {
   .upper-right {
@@ -1298,7 +1319,7 @@ export default {
   }
   }
 }
 }
 </style>
 </style>
-<style>
+<style lang="scss">
 .text img {
 .text img {
   max-width: 100%;
   max-width: 100%;
   height: auto;
   height: auto;
@@ -1308,6 +1329,13 @@ export default {
   width: 20%;
   width: 20%;
   justify-content: center;
   justify-content: center;
   align-self: center;
   align-self: center;
+  p{
+  display: inline-block;
+  white-space: nowrap; 
+  width: 100%; 
+  overflow: hidden;
+  text-overflow:ellipsis;
+  }
 }
 }
 .home_stock_table_right {
 .home_stock_table_right {
   display: flex;
   display: flex;

+ 4 - 0
src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -4241,6 +4241,10 @@ export default {
     deleteRow(index, rows) {
     deleteRow(index, rows) {
       rows.splice(index, 1);
       rows.splice(index, 1);
       this.updateDeduplication();
       this.updateDeduplication();
+      if(this.dataList.length==0){
+        this.form.fProductName = "";
+        this.form.fMarks = "";
+      }
     },
     },
     // 变更计价单位
     // 变更计价单位
     changeFeeUnit(row) {
     changeFeeUnit(row) {

+ 4 - 2
src/views/warehouseBusiness/inStock/index.vue

@@ -6037,8 +6037,8 @@ export default {
             );
             );
           }
           }
           if (response.data.warehouseBillsItem) {
           if (response.data.warehouseBillsItem) {
-            if(response.data.warehouseBillsItem.length>0){
-              this.form.fMblno=""
+            if (response.data.warehouseBillsItem.length > 0) {
+              this.form.fMblno = "";
             }
             }
             this.dataList = [];
             this.dataList = [];
             for (let list in this.dataList) {
             for (let list in this.dataList) {
@@ -7566,6 +7566,8 @@ export default {
       this.mum = sum;
       this.mum = sum;
 
 
       if (this.dataList.length === 0) {
       if (this.dataList.length === 0) {
+        this.form.fProductName = "";
+        this.form.fMarks = "";
         this.formBrowseStatus = false;
         this.formBrowseStatus = false;
         this.contrOl = false;
         this.contrOl = false;
         return false;
         return false;

+ 4 - 0
src/views/warehouseBusiness/outStock/index.vue

@@ -7183,6 +7183,10 @@ export default {
           return false;
           return false;
         }
         }
       }
       }
+      if(this.dataList.length==0){
+        this.form.fProductName = "";
+        this.form.fMarks = "";
+      }
     },
     },
     /* 远程模糊查询用户 */
     /* 远程模糊查询用户 */
     corpsRemoteMethod(name) {
     corpsRemoteMethod(name) {

+ 2 - 0
src/views/warehouseBusiness/stockTransfer/index.vue

@@ -6713,6 +6713,8 @@ export default {
     deleteRow(index, rows) {
     deleteRow(index, rows) {
       rows.splice(index, 1);
       rows.splice(index, 1);
       if (this.dataList.length === 0) {
       if (this.dataList.length === 0) {
+         this.form.fProductName = "";
+        this.form.fMarks = "";
         this.form.fMblno = "";
         this.form.fMblno = "";
         this.formBrowseStatus = false;
         this.formBrowseStatus = false;
         return false;
         return false;