caojunjie 4 年之前
父节点
当前提交
922a081a6f
共有 3 个文件被更改,包括 53 次插入15 次删除
  1. 0 2
      src/views/purchaseIssue/index.vue
  2. 31 13
      src/views/purchaseRequest/index.vue
  3. 22 0
      src/views/reportAnalysis/inoutStatistics.vue

+ 0 - 2
src/views/purchaseIssue/index.vue

@@ -53,8 +53,6 @@
     <div v-else class="app-container">
       <div style="display: flex;margin-bottom: 10px">
         <el-breadcrumb>
-          <el-breadcrumb-item style="font-weight: 700">销售出库</el-breadcrumb-item>
-          <el-breadcrumb-item style="font-weight: 700">销售出库详情页</el-breadcrumb-item>
           <el-breadcrumb-item style="margin-top: -7px;">
             <el-button
               style="margin-left: 10px"

+ 31 - 13
src/views/purchaseRequest/index.vue

@@ -51,17 +51,20 @@
     <div v-else class="app-container">
       <div style="display: flex;margin-bottom: 10px">
         <el-breadcrumb>
-          <el-breadcrumb-item style="font-weight: 700">采购申请</el-breadcrumb-item>
-          <el-breadcrumb-item style="font-weight: 700">采购申请详情页</el-breadcrumb-item>
-          <el-breadcrumb-item style="margin-top: -7px;">
+          <el-breadcrumb-item>
             <el-button
-              style="margin-left: 10px"
               size="mini"
               type="danger" plain
               @click="backToList"
               icon="el-icon-arrow-left">
               返回列表</el-button>
           </el-breadcrumb-item>
+          <el-breadcrumb-item style="font-weight: 700">
+            <el-button-group>
+              <el-button type="primary" size="mini" icon="el-icon-arrow-left" @click="sequence(true)">向前</el-button>
+              <el-button type="primary" size="mini" @click="sequence(true)">向后<i class="el-icon-arrow-right el-icon--right"></i></el-button>
+            </el-button-group>
+          </el-breadcrumb-item>
         </el-breadcrumb>
       </div>
       <h1 style="text-align: center;margin-top: -42px">采购申请单</h1>
@@ -111,7 +114,6 @@
       ref="ApprovalComments"
       @refreshDataList="returnData"
     ></approval-comments>
-
     <el-dialog
       title="打印采购"
       :visible.sync="dialogVisible"
@@ -177,8 +179,6 @@
     </el-dialog>
   </div>
 </template>
-
-
 <script>
 import { select } from '@/api/system/set'
 import {
@@ -579,13 +579,14 @@ export default {
           icon: 'el-icon-edit-outline',
           name: '生成销售单',
           disabled: false
-        },{
-          type: 'info',
-          size: 'mini',
-          icon: 'el-icon-edit-outline',
-          name: '生成出库单',
-          disabled: false
         }
+        // ,{
+        //   type: 'info',
+        //   size: 'mini',
+        //   icon: 'el-icon-edit-outline',
+        //   name: '生成出库单',
+        //   disabled: false
+        // }
       ],
       formOption: [
         {
@@ -913,6 +914,23 @@ export default {
       this.open = false;
       this.cancelTwo();
     },
+    sequence(res){
+      if (res === true){
+        console.log(this.$refs.avatar.form.fId)
+        let i = 0
+        for ( i ; i <= this.tableData.length;i++){
+          if (this.$refs.avatar.form.fId == this.tableData[i].fId) {
+            console.log(i)
+            console.log(this.tableData[i].fId)
+            console.log(this.tableData[--i].fId)
+            console.log(i)
+            return
+          }
+        }
+      }else {
+
+      }
+    },
     addOrUpdateHandle() {
       this.addOrUpdateVisible = true;
       this.$nextTick(() => {

+ 22 - 0
src/views/reportAnalysis/inoutStatistics.vue

@@ -51,6 +51,7 @@
 import { select } from '@/api/system/set'
 import{ queryData, company, productName, listExport} from '@/api/reportAnalysis/inoutStatistics'
 import Cookies from 'js-cookie'
+import { queryItem } from '@/api/purchaseRequest'
 
 export default {
   name: 'salesStatistics',
@@ -62,6 +63,7 @@ export default {
         fFeeType:[],
         fFeeid:[],
         fCorpid:[],
+        fGoodsid:[],
         fBillstatus:[{label:'全部',value:''},{label:'入账',value:'1'},{label:'未入账',value:'2'},]
       },
       tableData:[],
@@ -297,6 +299,14 @@ export default {
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
+        },{
+          span: 6,
+          label: 'fGoodsid',
+          name: '项目名称',
+          inputType: 1,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
         },
       ]
     }
@@ -331,6 +341,18 @@ export default {
         }
       }
     })
+    queryItem().then(res => {
+      console.log(res)
+      for (let item in res.data) {
+        this.dataList.fGoodsid.push({
+          label: res.data[item].projectName,
+          value: res.data[item].fId,
+          personNaem: res.data[item].personNaem,
+          corpsName: res.data[item].corpsName,
+          fCorpid: res.data[item].fCorpid
+        })
+      }
+    })
     let data = {
       tableName: this.queryList.tableName,
       userId: Cookies.get('userName')