修改

src/components/authorize.vue

@@ -169,16 +169,16 @@
           <li class="menu_item" :class="{'Fchecked':isChecked=='/groupEmpower'}"  @click="isChecked='/groupEmpower',CommonJump('groupEmpower')">
               <i class="el-icon-menu"></i><span>集团授权</span>
           </li>
-          <li class="menu_item" :class="{'Fchecked':isChecked=='/empowerManage'}"  @click="isChecked='/empowerManage',CommonJump('empowerManage')">
+          <li class="menu_item" v-if="ERPEmpId!=0" :class="{'Fchecked':isChecked=='/empowerManage'}"  @click="isChecked='/empowerManage',CommonJump('empowerManage')">
               <i class="el-icon-menu"></i><span>授权列表</span>
           </li>
-          <li class="menu_item" :class="{'Fchecked':isChecked=='/materialQuery'}"  @click="isChecked='/materialQuery',CommonJump('materialQuery')">
+          <li class="menu_item" v-if="ERPEmpId!=0" :class="{'Fchecked':isChecked=='/materialQuery'}"  @click="isChecked='/materialQuery',CommonJump('materialQuery')">
               <i class="el-icon-menu"></i><span>物料查询</span>
           </li>
-          <li class="menu_item" :class="{'Fchecked':isChecked=='/procurementMange'}"  @click="isChecked='/procurementMange',CommonJump('procurementMange')">
+          <li class="menu_item" v-if="ERPEmpId!=0" :class="{'Fchecked':isChecked=='/procurementMange'}"  @click="isChecked='/procurementMange',CommonJump('procurementMange')">
               <i class="el-icon-menu"></i><span>采购管理</span>
           </li>
-           <li class="menu_item" :class="{'Fchecked':isChecked=='/Materialwarehouse'}"  @click="isChecked='/Materialwarehouse',CommonJump('Materialwarehouse')">
+           <li class="menu_item" v-if="ERPEmpId!=0" :class="{'Fchecked':isChecked=='/Materialwarehouse'}"  @click="isChecked='/Materialwarehouse',CommonJump('Materialwarehouse')">
               <i class="el-icon-menu"></i><span>物料仓库</span>
           </li>
 
@@ -228,12 +228,14 @@
       return {
         currentUser: {},
         isChecked:'',
-        Height:0
+        Height:0,
+        ERPEmpId:0,
       };
     },
     created() {
       this.currentUser = this.getLocalStorage();
       console.log(this.getLocalStorage())
+      this.ERPEmpId =  this.currentUser.ERPEmpId
       this.isChecked=this.$route.path;
       if(this.$route.query.FIndex){
         this.CommonJump('groupEmpower');

src/components/empower/procurementMange.vue

@@ -690,7 +690,12 @@
       },
       AtterDigbtn(i){ // 点击规格选择的处理
          this.AtterDig =true;
-         this.SpecList = this.selectGoods[i].SpecificationList;
+         let a = [];
+         let data = this.selectGoods[i].SpecificationList
+          for(let i=0;i<data.length;i++){
+            a.push(data[i])
+          }
+         this.SpecList = a
           this.ggindex = i
       },
       chooseAttr(index){//没改变原数组但是还是 生效了 这里有疑问

src/components/orderMan/CostManagement.vue

@@ -14,6 +14,12 @@
           <el-option v-for="item in SupplierData" :key="item.Id" :label="item.Name" :value="item.ID">
           </el-option>
         </el-select>
+        <span>制单类型</span>
+        <el-select style="margin:0 10px" class="w100" @change="msg.pageIndex=1,getList()" v-model="msg.IsSelectAll" size="small"
+          placeholder="请选择">
+          <el-option v-for="item in MakingType" :key="item.Id" :label="item.Name" :value="item.Id">
+          </el-option>
+        </el-select>
         <span>是否制单</span>
         <el-select class="w100" style="margin-right: 10px;" @change="msg.pageIndex=1,getList()" v-model="msg.IsFinance" size="small"
           placeholder="请选择">
@@ -73,9 +79,15 @@
           SupplierId: 0, //供应商
           IsFinance: 0, //是否制单 0-全部 1-已制单 2-未制单
           StartTime: '',
-          EndTime: ''
+          EndTime: '',
+          IsSelectAll:0,
         },
         SupplierData: [], //供应商data
+        MakingType:[
+          {Id:0,Name:'全部'},
+          {Id:1,Name:'成本'},
+          {Id:2,Name:'运费'},
+        ],
         dateList: [], //日期
         total: 0,
         tableData: [], //列表数据
@@ -83,7 +95,8 @@
           SupplierId: 0,
           IsFinance: 0,
           IdList: [],
-          IsPublic: '0' //0-私账1-公账
+          IsPublic: '0', //0-私账1-公账
+          IsSelectAll:0,
         },
       }
     },
@@ -143,6 +156,7 @@
       setFince() {
         this.finMsg.SupplierId = this.msg.SupplierId;
         this.finMsg.IsFinance = this.msg.IsFinance;
+        this.finMsg.IsSelectAll = this.msg.IsSelectAll;
         this.apipost("/api/Supplier/PayCostFinance", this.finMsg, res => {
           if (res.data.resultCode == 1) {
             this.Success('设置成功');

src/components/orderMan/outboundManage.vue

@@ -19,7 +19,9 @@
         <el-table-column prop="Number" label="购买数量" width="150px">
         </el-table-column>
       </el-table>
-      
+      <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize" :current-page.sync="msg.pageIndex"
+        layout="prev, pager, next" :total="total">
+      </el-pagination>
     </div>
     <!-- 选择是否公账 -->
     <el-dialog title="请选择" :visible.sync="choiceFin" width="400px">
@@ -40,9 +42,16 @@
         loading: false,
         choiceFin: false,
        tableData:[],
+       total: 0,
        outobj:{
            ID:0,
            WarehouseOutGoodsList:[],
+       },
+       msg:{
+           pageIndex: 1,
+          pageSize: 15,
+          SupplierId:0
+          
        }
       }
     },
@@ -55,10 +64,12 @@
       getList() {
       
         this.loading = true;
-        this.assetsApipost("/api/WarehouseOut/GetNoOutOrderGoodsList", {SupplierId:0}, res => {
+        this.assetsApipost("/api/WarehouseOut/GetNoOutOrderGoodsList", this.msg, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
-            this.tableData = res.data.data;
+            // this.tableData = res.data.data;
+             this.total = res.data.data.count;
+            this.tableData = res.data.data.pageData;
           }else{
             this.Error(res.data.message);
           }