shish 2 years ago
parent
commit
609073f93e

+ 1 - 1
ghs/src/views/order/components/arrival.vue

@@ -141,7 +141,7 @@ export default {
 	},
 	methods: {
 		addItme(){
-
+			this.$emit('addNewItem',this.arrivalData)
 		},
 		init() {
 			this.data = []

+ 1 - 15
ghs/src/views/order/components/simple-item.vue

@@ -33,7 +33,6 @@
 
                     <template #slot-option-area-list>
                         <el-input v-model="search" placeholder="搜索花材" size="big" style="width:200px;" :clearable="true" ref="itemSearchRef" @input="changeSearch()" @focus="search=''"></el-input>
-                        <span style="margin-left:10px;font-size:27px;">【{{ currentData.customName?currentData.customName:'' }}】{{ currentData.itemName?currentData.itemName:'' }} 借库存</span>
                     </template>
                 </x-crud>
 			</div>
@@ -79,20 +78,7 @@ export default {
 			this.showArea = false;
 		},
         confirmAdd(info){
-			let that = this
-			if(Number(info.bigCount)<=0){
-                this.$message.error('请填写数量')
-				return false
-			}
-            let params = {inId:this.currentData.itemId,outId:info.id,num:info.bigCount,bookItemCustomId:this.currentData.id}
-            this.$confirm('确认借用?', '提示', {confirmButtonText: '确定',cancelButtonText: '取消',type: 'warning'}).then(() => {
-                this.$service.checkOrder.loan(params).then(res => {
-					that.$message.success('操作成功')
-					setTimeout(()=>{
-						this.showArea = false
-					},1300)
-                })
-            })
+
         },
 		onLoad({ ctx, app }) {
 			this.app = app;

+ 13 - 2
ghs/src/views/order/list.vue

@@ -162,7 +162,9 @@
 
     </x-crud>
 
-    <arrival ref="arrivalRef" :arrivalData="arrivalData" />
+    <arrival ref="arrivalRef" :arrivalData="arrivalData" @addNewItem="addNewItem" />
+
+    <simple-item ref="simpleItemRef" :simpleData="simpleData" />
 
     <!-- 用户详情 -->
     <order-detail ref="orderDetail" :orderOperate="optionData" />
@@ -228,12 +230,14 @@
 import SelOrder from './components/sel-order';
 import OrderDetail from './components/order-detail';
 import arrival from './components/arrival';
+import simpleItem from './components/simple-item';
 import {hiprint, defaultElementTypeProvider} from 'vue-plugin-hiprint'
 export default {
   components: {
     SelOrder,
     OrderDetail,
-    arrival
+    arrival,
+    simpleItem
   },
   data() {
     return {
@@ -268,6 +272,7 @@ export default {
       ],
       optionData: {},
       arrivalData:{},
+      simpleData:{},
       orderData:'',
       book:"-1",
       clearSign:"-1",
@@ -327,6 +332,12 @@ export default {
   
 	},
   methods: {
+    addNewItem(data){
+      this.simpleData = data
+      setTimeout(() => {
+        this.$refs.simpleItemRef.init()
+      })
+    },
     //预订单的确认发货
     confirmArrival(info){
       this.arrivalData = {id:info.id}