Explorar o código

修改出入库,下拉未判断问题

caojunjie %!s(int64=3) %!d(string=hai) anos
pai
achega
36d66c1074

+ 3 - 3
src/combination/MainForm.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form label-width="88px" ref="form" :model="form" style="display:flex;flex-wrap: wrap">
           <el-form-item :label="item.name" v-for="(item,index) in searchdata" :key="item.index" :label-width="item.labelSize + 'px'" :rules="[item.rules]" :prop="item.label" v-if="(index+1) <= inDex">
-            <el-select v-if="item.form == 1" filterable @change="changeWarehouse" :disabled="item.disabled" clearable v-model="form[item.label]" :style="{ width: item.width + 'px' }">
+            <el-select v-if="item.form == 1" filterable @change="changeWarehouse(item)" :disabled="item.disabled" clearable v-model="form[item.label]" :style="{ width: item.width + 'px' }">
               <el-option v-for="(item,index) in item.data"
               :key="index"
               :label="item.label"
@@ -48,8 +48,8 @@ export default {
     console.log(this.searchdata)
   },
   methods:{
-    changeWarehouse(){
-      this.$emit('changeWarehouse')
+    changeWarehouse(item){
+      this.$emit('changeWarehouse',item)
     },
     hide() {
       if(this.form.first && this.form.last){

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

@@ -1731,7 +1731,8 @@ export default {
         this.formDataList = {
           pageNum:1,
           pageSize:10,
-          timeInterval:null
+          timeInterval:null,
+          fBilltype: 'XS'
         }
         this.$refs.avatar.assignmentTime(this.formDataList)
         this.$refs.avatar.submitForm()

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 240 - 187
src/views/purchaseRequest/index.vue


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

@@ -274,6 +274,14 @@ export default {
           checked: 0,
           width: 100,
           onabort: ''
+        },
+        {
+          surface: '23',
+          label: 'fUnitprice',
+          name: '单价',
+          checked: 0,
+          width: 100,
+          onabort: ''
         }
       ],
       formOption: [

+ 1 - 2
src/views/reportAnalysis/purchaseRequest.vue

@@ -34,7 +34,6 @@
         :page-sizes="[10,100,200,500,1000]"
         @pagination="getList"
       />
-
     </div>
 <!--    <el-pagination-->
 <!--      style="float: right;margin-top: 10px"-->
@@ -340,7 +339,7 @@ export default {
     },
     // 显示搜索条件、点击后会调用此方法
     showSearch() {
-      console.log('到我了')
+      // console.log('到我了')
       this.searchWhether = !this.searchWhether
     },
     //搜索、重置、展开

+ 15 - 13
src/views/warehouse/outStock/index.vue

@@ -934,21 +934,23 @@ export default {
       })
     },
     //更换仓库
-    changeWarehouse(){
-      if(this.detailData.length != 0){
-        for(let li in this.detailData){
-          this.detailData[li].fWarehouseid = ''
+    changeWarehouse(item){
+      if (item.label == "fWarehouseid"){
+        if(this.detailData.length != 0){
+          for(let li in this.detailData){
+            this.detailData[li].fWarehouseid = ''
+          }
         }
+        getArea(this.detailForm.fWarehouseid).then(res=>{
+          this.listData.fWarehouseid = []
+          for(let item in res.data){
+            this.listData.fWarehouseid.push({
+              label:res.data[item].fWarehouseInformation,
+              value:res.data[item].id
+            })
+          }
+        })
       }
-      getArea(this.detailForm.fWarehouseid).then(res=>{
-        this.listData.fWarehouseid = []
-        for(let item in res.data){
-          this.listData.fWarehouseid.push({
-            label:res.data[item].fWarehouseInformation,
-            value:res.data[item].id
-          })
-        }
-      })
     },
     //自动合计金额
     totalAmount(scope,item) {

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio