no message
							parent
							
								
									be227e6b9f
								
							
						
					
					
						commit
						dc235ae180
					
				| 
						 | 
					@ -48,9 +48,9 @@ export function collectMOCreate(data) {
 | 
				
			||||||
  })
 | 
					  })
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export function doBindStock(data) {
 | 
					export function materialIn(data) {
 | 
				
			||||||
  return request({
 | 
					  return request({
 | 
				
			||||||
    url: 'api/app/bindStock',
 | 
					    url: 'api/app/materialIn',
 | 
				
			||||||
    method: 'post',
 | 
					    method: 'post',
 | 
				
			||||||
    data
 | 
					    data
 | 
				
			||||||
  })
 | 
					  })
 | 
				
			||||||
| 
						 | 
					@ -58,4 +58,4 @@ export function doBindStock(data) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default { add, del,edit,doCheckAsn,collectMOCreate,updateContainer}
 | 
					export default { add, del,edit,doCheckAsn,collectMOCreate,materialIn}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -242,7 +242,7 @@
 | 
				
			||||||
      </el-form>
 | 
					      </el-form>
 | 
				
			||||||
      <div slot="footer" class="dialog-footer">
 | 
					      <div slot="footer" class="dialog-footer">
 | 
				
			||||||
        <el-button @click="doManLiaoCancel">取消</el-button>
 | 
					        <el-button @click="doManLiaoCancel">取消</el-button>
 | 
				
			||||||
        <el-button type="primary" @click="submitBindStock">确认</el-button>
 | 
					        <el-button type="primary" @click="submitMaterialIn">确认</el-button>
 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
    </el-dialog>
 | 
					    </el-dialog>
 | 
				
			||||||
    <!--表格渲染-->
 | 
					    <!--表格渲染-->
 | 
				
			||||||
| 
						 | 
					@ -289,7 +289,7 @@
 | 
				
			||||||
</template>
 | 
					</template>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<script>
 | 
					<script>
 | 
				
			||||||
import crudAsnDetail, {add, updateContainer, doBindStock} from '@/api/asnDetail'
 | 
					import crudAsnDetail, {add, updateContainer, doBindStock, materialIn} from '@/api/asnDetail'
 | 
				
			||||||
import CRUD, {presenter, header, form, crud} from '@crud/crud'
 | 
					import CRUD, {presenter, header, form, crud} from '@crud/crud'
 | 
				
			||||||
import rrOperation from '@crud/RR.operation'
 | 
					import rrOperation from '@crud/RR.operation'
 | 
				
			||||||
import crudOperation from '@crud/CRUD.operation'
 | 
					import crudOperation from '@crud/CRUD.operation'
 | 
				
			||||||
| 
						 | 
					@ -589,12 +589,12 @@ export default {
 | 
				
			||||||
      })
 | 
					      })
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    submitBindStock() {
 | 
					    submitMaterialIn() {
 | 
				
			||||||
      this.$refs['manLiaoform'].validate(valid => {
 | 
					      this.$refs['manLiaoform'].validate(valid => {
 | 
				
			||||||
        if (!valid) {
 | 
					        if (!valid) {
 | 
				
			||||||
          return
 | 
					          return
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        doBindStock(this.BindStock).then(res => {
 | 
					        materialIn(this.BindStock).then(res => {
 | 
				
			||||||
          if (res.status = 200) {
 | 
					          if (res.status = 200) {
 | 
				
			||||||
            this.manliao = false;//关闭窗口
 | 
					            this.manliao = false;//关闭窗口
 | 
				
			||||||
            this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
 | 
					            this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -140,7 +140,7 @@
 | 
				
			||||||
          </template>
 | 
					          </template>
 | 
				
			||||||
        </el-table-column>
 | 
					        </el-table-column>
 | 
				
			||||||
        <el-table-column prop="jobPriority" label="优先级" width="60"/>
 | 
					        <el-table-column prop="jobPriority" label="优先级" width="60"/>
 | 
				
			||||||
        <el-table-column prop="jobMessage" label="返回报文" :show-overflow-tooltip="true" width="150"/>
 | 
					        <el-table-column prop="jobsage" label="返回报文" :show-overflow-tooltip="true" width="150"/>
 | 
				
			||||||
        <el-table-column prop="createTime" label="创建时间" width="140"/>
 | 
					        <el-table-column prop="createTime" label="创建时间" width="140"/>
 | 
				
			||||||
        <el-table-column prop="startTime" label="开始时间" width="140"/>
 | 
					        <el-table-column prop="startTime" label="开始时间" width="140"/>
 | 
				
			||||||
        <el-table-column prop="endTime" label="完成时间" width="140"/>
 | 
					        <el-table-column prop="endTime" label="完成时间" width="140"/>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -120,11 +120,7 @@
 | 
				
			||||||
            <div>{{ scope.row.item.name }}</div>
 | 
					            <div>{{ scope.row.item.name }}</div>
 | 
				
			||||||
          </template>
 | 
					          </template>
 | 
				
			||||||
        </el-table-column>
 | 
					        </el-table-column>
 | 
				
			||||||
        <el-table-column prop="status" label="状态">
 | 
					
 | 
				
			||||||
          <template slot-scope="scope">
 | 
					 | 
				
			||||||
            {{ dict.label.pick_status[scope.row.status] }}
 | 
					 | 
				
			||||||
          </template>
 | 
					 | 
				
			||||||
        </el-table-column>
 | 
					 | 
				
			||||||
        <el-table-column prop="orderQty" label="订单数量"/>
 | 
					        <el-table-column prop="orderQty" label="订单数量"/>
 | 
				
			||||||
        <el-table-column prop="allocatedQty" label="分配数量"/>
 | 
					        <el-table-column prop="allocatedQty" label="分配数量"/>
 | 
				
			||||||
        <el-table-column prop="pickedQty" label="拣货数量"/>
 | 
					        <el-table-column prop="pickedQty" label="拣货数量"/>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue