零件分配

src/api/ManufacturingCenter/PartAssignment.js

@@ -395,3 +395,15 @@ export function OutPart(num) {
     }
   })
 }
+export function searchBillNumber(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间管理_基本件采购_请购单_查询请购单号_查询数据'
+    }
+  })
+}

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -312,20 +312,15 @@
     </el-row>
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="新增请购单" center style="min-height: 300px" width="350px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
-        <el-form-item label="请购车间" prop="请购车间">
+        <el-form-item label="请款单号" prop="请款单号">
-          <el-input
+          <el-input :disabled="true" v-model="form.请款单号" size="small" style="width:160px"/>
-            v-model="form.请购车间"
+        </el-form-item>
-            size="small"
+        <el-form-item v-show="false" label="请购车间" prop="请购车间">
-            style="width:160px"/>
+          <el-input v-model="form.请购车间" size="small" style="width:160px"/>
         </el-form-item>
         <el-form-item label="请购人员">
-          <el-input
+          <el-input v-model="name" size="small" readonly style="width:160px;"/>
-            v-model="name"
-            size="small"
-            readonly
-            style="width:160px;"/>
         </el-form-item>
-
         <el-form-item label="请购时间" prop="请购时间">
           <el-date-picker
             v-model="form.请购时间"
@@ -337,10 +332,7 @@
             placeholder="选择日期"/>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input
+          <el-input v-model="form.Remarks" size="small" style="width:160px"/>
-            v-model="form.Remarks"
-            size="small"
-            style="width:160px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -349,6 +341,7 @@
         <el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
       </div>
     </el-dialog>
+
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="零件数量" center style="min-height: 300px" width="400px">
       <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-form-item label="数量" prop="数量">
@@ -557,7 +550,7 @@
 </template>
 
 <script>
-import { DeliveryTimeSelect, initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, Delete, Delete1, editStock, editNum, OutPart, PurchasingDepartmentBack, purchaseRequisition2Back } from '@/api/ManufacturingCenter/PartAssignment'
+import { searchBillNumber, DeliveryTimeSelect, initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, Delete, Delete1, editStock, editNum, OutPart, PurchasingDepartmentBack, purchaseRequisition2Back } from '@/api/ManufacturingCenter/PartAssignment'
 import { mapGetters } from 'vuex'
 import { getNowShotTime } from '@/utils/tool'
 import Cookie from 'js-cookie'
@@ -601,6 +594,7 @@ export default {
       dialogFormVisible: false,
       RequisitionList: '',
       form: {
+        请款单号: '',
         请购单编号: '',
         请购车间: '制造部',
         请购时间: '',
@@ -1040,6 +1034,9 @@ export default {
     handleAdd() {
       this.handleAdd_disable = false
       this.addForm('form', [this.dialogFormVisible = true, this.title = '增加'])
+      searchBillNumber().then(response => {
+        this.form.请款单号 = response.data[0].单号
+      })
       this.form.请购时间 = getNowShotTime()
     },
     submitAdd(formName) {

src/views/PurchasingCenter/MaterialManagement/index.vue

@@ -4,14 +4,7 @@
       <el-row>
         <el-col style="margin-top: 3px;width: 180px;margin-left: 10px">
           <el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable style="width: 170px"/>
-          <el-select
+          <el-select v-show="false" v-model="MaterialCategoryValue" placeholder="物料类别" size="small" clearable style="width: 140px" @change="searchMaterialVariety">
-            v-show="false"
-            v-model="MaterialCategoryValue"
-            placeholder="物料类别"
-            size="small"
-            clearable
-            style="width: 140px"
-            @change="searchMaterialVariety">
             <el-option
               v-for="item in MaterialCategory"
               :key="item.value"
@@ -20,20 +13,8 @@
           </el-select>
         </el-col>
         <el-col style="margin-top: 3px;width: 190px">
-          <el-input
+          <el-input v-model="MaterialSpecification" placeholder="物料规格" size="small" clearable style="width: 190px"/>
-            v-model="MaterialSpecification"
+          <el-select v-show="false" v-model="MaterialVarietyValue" placeholder="物料品种" size="small" clearable style="width: 140px" @change="searchMaterial">
-            placeholder="物料规格"
-            size="small"
-            clearable
-            style="width: 190px"/>
-          <el-select
-            v-show="false"
-            v-model="MaterialVarietyValue"
-            placeholder="物料品种"
-            size="small"
-            clearable
-            style="width: 140px"
-            @change="searchMaterial">
             <el-option
               v-for="item in MaterialVariety"
               :key="item.value"
@@ -42,40 +23,18 @@
           </el-select>
         </el-col>
         <el-col style="margin-top: 3px;width: 190px;margin-left: 10px">
-          <el-input
+          <el-input v-model="MaterialModel" placeholder="物料型号" size="small" clearable style="width: 190px"/>
-            v-model="MaterialModel"
+          <el-input v-show="false" v-model="FullNameOfMaterial" placeholder="物料全称" size="small" clearable style="width: 170px"/>
-            placeholder="物料型号"
-            size="small"
-            clearable
-            style="width: 190px"/>
-          <el-input
-            v-show="false"
-            v-model="FullNameOfMaterial"
-            placeholder="物料全称"
-            size="small"
-            clearable
-            style="width: 170px"/>
         </el-col>
         <el-col style="margin-top: 3px;width: 250px;margin-left: 10px">
-          <el-select
+          <el-select v-model="GonghuoshangValue" placeholder="供货商" filterable style="width: 140px" size="small" clearable>
-            v-model="GonghuoshangValue"
-            placeholder="供货商"
-            filterable
-            style="width: 140px"
-            size="small"
-            clearable>
             <el-option
               v-for="item in Gonghuoshang"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="small" plain @click="pageCurrent=1;searchMaterial()">查询
-            type="primary"
-            icon="el-icon-search"
-            size="small"
-            plain
-            @click="pageCurrent=1;searchMaterial()">查询
           </el-button>
         </el-col>
       </el-row>
@@ -96,13 +55,7 @@
       <!--</el-col>-->
       <el-row>
         <el-col style="width: 150px;margin-left: 10px">
-          <el-select
+          <el-select v-show="false" v-model="MaterialSourceValue" placeholder="物料来源" style="margin-bottom: 3px;margin-top: 10px;width: 140px" size="small" clearable>
-            v-show="false"
-            v-model="MaterialSourceValue"
-            placeholder="物料来源"
-            style="margin-bottom: 3px;margin-top: 10px;width: 140px"
-            size="small"
-            clearable>
             <el-option
               v-for="item in MaterialSource"
               :key="item.value"
@@ -121,14 +74,7 @@
         </el-col>
         <el-col style="margin-left: 10px;width: 550px">
           <el-button :disabled="parseInt(token) !== 11 && parseInt(token) !== 36" type="distribution" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">物料</el-button>
-          <el-button
+          <el-button :disabled="parseInt(token) !== 11 && parseInt(token) !== 36" type="distribution" icon="el-icon-refresh" size="small" style="margin-left: 10px" @click="CategoryMaintenance">维护物料类别</el-button>
-            :disabled="parseInt(token) !== 11 && parseInt(token) !== 36"
-            type="distribution"
-            icon="el-icon-refresh"
-            size="small"
-            style="margin-left: 10px"
-            @click="CategoryMaintenance">维护物料类别
-          </el-button>
           <el-button type="distribution" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="open()">供货商</el-button>
           <el-badge :value="weishenhe" class="item">
             <el-button type="primary" plain size="small" style="margin-left: 10px" @click="daishenhe()">采购部新增物料审核</el-button>