| 
					
				 | 
			
			
				@@ -4,71 +4,84 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     :close-on-click-modal="false" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     :visible.sync="visible"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="auto"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <el-form-item label="编码" prop="code"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <el-input v-model="dataForm.code" placeholder="编码系统自动生成"></el-input> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-row class="my-row"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <el-col :span="12"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-form-item label="编码" prop="code"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <el-input v-model="dataForm.code" placeholder="缺字段"></el-input> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      </el-row> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-row class="my-row"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-col :span="8"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <el-form-item label="名称" prop="materialName"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-input v-model="dataForm.materialName" placeholder="请填写名称"></el-input> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-col :span="8" style="padding-left: 20px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <el-form-item label="入库申请人" prop="userId"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            <user-component v-model="dataForm.userId"></user-component> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <user-component v-model="dataForm.userId" @userSelected="userChanged"></user-component> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <el-col :span="12" style="padding-left: 20px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-col :span="8" style="padding-left: 20px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <el-form-item label="申请人部门" prop="orgId"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            <el-input v-model="org"></el-input> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-input :disabled="true" v-model="dataForm.orgName" placeholder="请选择入库申请人"></el-input> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </el-row> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-row class="my-row"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <el-col :span="12"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          <el-form-item label="名称" prop="materialName"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            <el-input v-model="dataForm.materialName" placeholder="请填写名称"></el-input> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-col :span="8"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <el-form-item label="单位" prop="unitName"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-input v-model="dataForm.unitName" placeholder="缺字段"></el-input> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <el-col :span="12" style="padding-left: 20px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-col :span="8" style="padding-left: 20px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <el-form-item label="类别" prop="cateId"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <dict-select v-model:dict-id="dataForm.cateId" v-bind:dict-type="dictType"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-col :span="8" style="padding-left: 20px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <el-form-item label="规格" prop="specifications"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-input v-model="dataForm.specifications" placeholder="缺字段"></el-input> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      </el-row> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-row class="my-row"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-col :span="8"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <el-form-item label="单价" prop="price"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-input-number v-model="dataForm.price" :precision="2" :min="0.00" :step="0.1"></el-input-number> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-col :span="8" style="padding-left: 20px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <el-form-item label="数量" prop="cnt"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-input-number v-model="dataForm.cnt" :min="0"></el-input-number> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-col :span="8" style="padding-left: 20px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <el-form-item label="金额" prop="amount"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-input :disabled="true" v-model="dataForm.price * dataForm.cnt"></el-input> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      </el-row> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-row class="my-row"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-col :span="8"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <el-form-item label="批次号" prop="batchNumber"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-input v-model="dataForm.batchNumber" placeholder="请填写入库物品(零件)批次"></el-input> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-col :span="8" style="padding-left: 20px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <el-form-item label="来源" prop="source"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-input v-model="dataForm.source" placeholder="来源"></el-input> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-col :span="8" style="padding-left: 20px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <el-form-item label="是否换算" prop="transfer"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-input v-model="dataForm.transfer" placeholder="缺字段"></el-input> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      </el-row> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-row> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-form-item label="备注" prop="notes"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <el-input v-model="dataForm.notes" placeholder="备注"></el-input> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </el-row> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--      <el-row class="my-row">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--        <el-col :span="12">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--          <el-form-item label="数量" prop="cnt">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--            <el-input-number v-model="dataForm.cnt" :min="0" placeholder="物品(零件)数量"></el-input-number>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--          </el-form-item>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--        </el-col>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--        <el-col :span="12">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--          <el-form-item label="单价" prop="price">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--            <el-input-number v-model="dataForm.price" :precision="2" :step="0.1" :min="0.0" placeholder="物品(零件)单价"></el-input-number>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--          </el-form-item>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--        </el-col>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--      </el-row>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--      <el-row class="my-row">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--        <el-col :span="12">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--          <el-form-item label="金额" prop="amount">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--            <el-input v-model="dataForm.price * dataForm.cnt" :disabled="true" placeholder="物品(零件)总金额"></el-input>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--          </el-form-item>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--        </el-col>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--      </el-row>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--      <el-row class="my-row">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--        <el-col :span="12">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--          <el-form-item label="存放仓库" prop="warehouseId">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--            <warehouse-select ref="warehouse" v-model:warehouse-id="dataForm.warehouseId"/>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--          </el-form-item>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--        </el-col>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--        <el-col :span="12">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--          <el-form-item label="存放货架" prop="shelveId">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--            <shelve-select ref="shelve" v-model:warehouse-id="dataForm.warehouseId" v-model:shelve-id="dataForm.shelveId"/>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--          </el-form-item>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--        </el-col>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--      </el-row>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--      <el-row class="my-row">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--        <el-col :span="24">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--          <el-form-item label="备注" prop="notes">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--            <el-input v-model="dataForm.notes" placeholder="备注"></el-input>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--          </el-form-item>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--        </el-col>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--      </el-row>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </el-form> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <span slot="footer" class="dialog-footer"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-button @click="visible = false">取消</el-button> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -80,12 +93,12 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <script> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   import UserComponent from '../common/user-component' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   import DictSelect from '../sys/dict-select' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  import {getUUID} from '../../../utils' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     name: 'stock-order-inbound', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     components: {DictSelect, UserComponent}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     data () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       return { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        org: '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         visible: false, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         dictType: 'material_type', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         dataForm: { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -105,7 +118,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           state: 0, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           templateItemPlanId: '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           usage: '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          userId: '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          userId: '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          orgName: '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         dataRule: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -114,36 +128,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     methods: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       init () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.visible = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // this.dataForm.id = id || 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // if (this.dataForm.materialId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //   this.$http({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //     url: this.$http.adornUrl(`/biz-service/inbound-record-ctl/info/${this.dataForm.id}`), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //     method: 'get', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //     params: this.$http.adornParams() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //   }).then(({data}) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //     if (data.code === '200') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.visible = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.id = data.data.id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.amount = data.data.amount 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.applicant = data.data.applicant 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.approver = data.data.approver 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.batchNumber = data.data.batchNumber 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.cnt = data.data.cnt 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.materialId = data.data.materialId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.materialName = data.data.materialName 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.orgId = data.data.orgId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.price = data.data.price 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.recordType = data.data.recordType 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.source = data.data.source 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.state = data.data.state 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.templateItemPlanId = data.data.templateItemPlanId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.usage = data.data.usage 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.dataForm.userId = data.data.userId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //     } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //       this.$message.error(data.msg) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //   }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.dataForm.code = getUUID() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       // 表单提交 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       dataFormSubmit () { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -191,6 +176,19 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       validateField (type) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.$refs.dataForm.validateField(type) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      userChanged (userId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.$http({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          url: this.$http.adornUrl('/user-service/user/info/' + userId), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          method: 'get' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }).then(({data}) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          if (data && data.code === '200') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            this.dataForm.orgId = data.data.orgId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            this.dataForm.orgName = data.data.orgName 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            this.$message.error(data.msg) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 |