zhangqiOMG 2 years ago
parent
commit
ce259937ec

+ 49 - 18
src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -231,16 +231,40 @@
           width="100">
         </el-table-column>
         <el-table-column
+          v-if="checkNB"
+          prop="stockname"
+          label="仓库"
+          width="150">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.stockid" size="mini" placeholder="请选择">
+              <el-option
+                v-for="item in stockOptions"
+                :key="item.stockid"
+                :label="item.stockname"
+                :value="item.stockid"
+                @click.native="rowChange(scope.row,scope.$index)">
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="checkNB"
           prop="position"
           label="仓位"
-          width="100">
+          width="150">
+          <template slot-scope="scope">
+            <el-input size="mini" v-model="scope.row.position" @input="rowChange(scope.row,scope.$index)" placeholder="输入仓位"></el-input>
+          </template>
         </el-table-column>
         <el-table-column
+          v-if="checkNB"
           prop="batchno"
           label="批号"
-          width="100">
+          width="150">
+          <template slot-scope="scope">
+            <el-input size="mini" v-model="scope.row.batchno" @input="rowChange(scope.row,scope.$index)" placeholder="输入批号"></el-input>
+          </template>
         </el-table-column>
-
         <el-table-column
           label="备注"
           width="300"
@@ -293,6 +317,16 @@ export default {
     excel:() =>  import('../export_excel'),
     addProduct
   },
+  computed: {
+    checkNB () {
+      let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
+      if (siteid === 'NB' && this.data.type === '特殊订单' && this.data.typemx === '样品') {
+        return true
+      } else {
+        return false
+      }
+    }
+  },
   data () {
     return {
       drawer:false,
@@ -321,7 +355,8 @@ export default {
       total:0,
       currentPage:0,
       time: null,
-      value2:''
+      value2:'',
+      stockOptions:[]
     }
   },
   methods:{
@@ -355,19 +390,8 @@ export default {
         this.$emit('onSuccess')
       })
     },
-    onInput (data,index) {
-      // if (this.data.type !== '特殊订单') {
-      //   if(data.price > data.oldprice) 
-      //     data.price  = data.oldprice; 
-      //   if(data.price  < 0) 
-      //       data.price  = 0;
-      // }
-      this.$set(this.tableData,index,data)
-    },
     rowChange (val,index) {
       let that = this
-     
-      // // 防抖
       if(this.time !== null){
         clearTimeout(this.time);
       }
@@ -384,12 +408,15 @@ export default {
             "needdate": val.needdate,//可以不传,修改交期
             "price":val.price,
             "remarks":val.remarks,
-            "defaultprice":val.defaultprice
+            "defaultprice":val.defaultprice,
+            "stockid":val.stockid,
+            "position":val.position,
+            "batchno":val.batchno
           }]
         },()=>{
           this.$set(this.tableData,index,val)
         })
-      },1000)
+      },500)
     },
     onDateChange (val){
       let that = this
@@ -477,10 +504,14 @@ export default {
         this.$emit('onSuccess')
       })
     },
+    async queryStock () {
+      const res = await this.$store.dispatch('optiontypeselect','stockselect')
+      this.stockOptions = res.data
+    }
   },
   mounted () {
     this.listData()
-    console.log("表结构")
+    this.queryStock()
     this.columnTitle  = []
     this.$refs.multipleTable.$children.forEach(obj => {
 

+ 1 - 1
src/SDrpManagement/invoiceapp_saler/index.vue

@@ -4,7 +4,7 @@
     <basicLayout 
       ref="basicLayout" 
       :oldFormPath="{
-        add:'HDrpManagement/invoiceapp/modules'
+        add:'SDrpManagement/invoiceapp_saler/modules'
       }"
       tableName="invoiceTable" 
       idName="sa_invoiceapplyid" 

+ 1 - 1
src/SDrpManagement/invoiceapp_saler/modules/add.vue

@@ -19,7 +19,7 @@
                   placement="bottom"
                   trigger="click"
                   v-model="visible">
-                  <invoiceCanUseAgent id="20230228103104" :qiyi="true" ref="UseAgent" @selectRow="selectRow"></invoiceCanUseAgent>
+                  <invoiceCanUseAgent :id="20230228103104" :qiyi="true" ref="UseAgent" @selectRow="selectRow"></invoiceCanUseAgent>
                   <el-input readonly slot="reference" v-model="form.enterprisename" @focus="queryAgent" suffix-icon="el-icon-arrow-down" placeholder="企业"></el-input>
                 </el-popover>
               </el-form-item>

+ 2 - 7
src/template/invoiceCanUseAgent/index.vue

@@ -59,7 +59,7 @@
 
 <script>
 export default {
-  props:['id'],
+  props:['id','qiyi'],
   data () {
     return {
       param:{
@@ -77,14 +77,9 @@ export default {
       currentPage:0
     }
   },
-  props:{
-    qiyi: {
-      type:Boolean,
-      default: () => false
-    }
-  },
   methods:{
     async listData () {
+      console.log(this.id)
       this.param.id = this.id
       const res = await this.$api.requested(this.param)
       this.tableData = res.data