Merge branch 'master' of http://123.56.95.229:10010/r/高精

src/api/ManufacturingCenter/CreatePreparationBill.js

@@ -46,7 +46,7 @@ export function edit(num1) {
   })
 }
 // 外购备料
-export function edit2(num1) {
+export function edit2(num1, id) {
   return request({
     url: '',
     method: 'post',
@@ -55,7 +55,7 @@ export function edit2(num1) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间生产管理工艺_备料单导出_外购备料',
-      param: `工艺计划流水号组=${num1}&是否外购备料=1`
+      param: `工艺计划流水号组=${num1}&是否外购备料=1&分配人员编号=${id}`
     }
   })
 }

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/main.js

@@ -63,3 +63,13 @@ new Vue({
   store,
   render: h => h(App)
 })
+
+import request from '@/utils/request'
+export function ExecDatabase(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: num
+  })
+}
+// end--->

src/views/Inventory/SelfMadePartsWarehouseOut/index.vue

@@ -29,7 +29,7 @@
       </el-row>
     </el-card>
     <el-card>
-      <el-table :data="tableData" style="width: 1020px" height="580" stripe size="mini" border @selection-change="handleSelectionChange">
+      <el-table :data="tableData" style="width: 1120px" height="580" stripe size="mini" border @selection-change="handleSelectionChange">
         <el-table-column
           type="selection"
           width="45"/>
@@ -54,6 +54,11 @@
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="入库时间" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.入库时间 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="库存数量" width="90px">
           <template slot-scope="scope">
             {{ scope.row.出库数量1 }}
@@ -180,6 +185,7 @@ export default {
               组号: response.data.rows[i].组号,
               零件图号: response.data.rows[i].零件图号,
               零件名称: response.data.rows[i].零件名称,
+              入库时间: response.data.rows[i].入库时间,
               已出库数量: Number(response.data.rows[i].出库数量),
               入库数量: Number(response.data.rows[i].入库数量),
               工艺计划流水号: response.data.rows[i].工艺计划流水号,

src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue

@@ -22,7 +22,7 @@
     <el-row>
       <el-col :span="8">
         <el-card>
-          <el-table :data="tableData1" :row-class-name="tableRowClassName" style="height: 670px" highlight-current-row border>
+          <el-table :data="tableData1" :row-class-name="tableRowClassName" empty-text="   " style="height: 670px" highlight-current-row border>
             <el-table-column align="center" label="工序名" width="110">
               <template slot-scope="scope">
                 {{ scope.row.工艺名称 }}

src/views/ManufacturingCenter/CreatePreparationBill/index.vue

@@ -250,12 +250,13 @@ export default {
       }
     },
     edit2() {
+      console.log(this.$store.state.user.id, 9090)
       if (this.tableData2.length === 0) {
         this.$message.warning('暂无数据')
       } else {
         this.a = 0
         for (let i = 0; i < this.tableData2.length; i++) {
-          edit2(this.tableData2[i].工艺计划流水号).then(response => {
+          edit2(this.tableData2[i].工艺计划流水号, this.$store.state.user.id).then(response => {
             this.a += parseInt(response.data[0].result)
             if (this.a === this.tableData2.length) {
               this.pageSize = 10

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/ManufacturingCenter/ProductionPlanQuery/index.vue

@@ -127,7 +127,7 @@ export default {
     loginsession() {
       this.$axios({
         methods: 'post',
-        url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=0000',
+        url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=1222',
         data: {
           userName: '0000'
         }

src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue

@@ -188,7 +188,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="callOff('form')">取消</el-button>
-        <el-button type="primary" @click="submit('form')">确定</el-button>
+        <el-button :disabled="ADD_disable" type="primary" @click="submit('form')">确定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -201,6 +201,7 @@ import { getNowTime } from '@/utils/tool'
 export default {
   data() {
     return {
+      ADD_disable: false,
       equipmentName: '', // 设备名称
       List: [],
       check: 0,
@@ -296,7 +297,6 @@ export default {
         this.$refs['form'].resetFields()
       }
       this.title = '编辑设备'
-      this.dialogFormVisible = true
       this.form.设备名称 = row.设备名称
       this.form.设备编号 = row.设备编号
       this.form.设备型号 = row.设备型号
@@ -308,6 +308,8 @@ export default {
       this.form.整改工时系数 = row.整改工时比例
       this.form.预留工时系数 = row.设备预留工时系数
       this.equipmentSerialNumber = row.设备流水号
+      this.ADD_disable = false
+      this.dialogFormVisible = true
     },
     submit(formName) {
       this.$refs[formName].validate((valid) => {
@@ -321,6 +323,7 @@ export default {
       })
     },
     submitAdd() {
+      this.ADD_disable = true
       for (let i = 0; i < this.processingName.length; i++) {
         if (this.form.设备加工工艺 === this.processingName[i].value) {
           this.processing1 = this.processingName[i].processing
@@ -336,19 +339,21 @@ export default {
           this.dialogFormVisible = false
           this.fetchData()
         } else {
+          this.ADD_disable = false
           this.$message.error('信息添加失败')
         }
       })
     },
     ADD() {
       this.addForm('form')
-      this.dialogFormVisible = true
       this.form.contractSigningDate = getNowTime()// new Date()
       this.temp = 1
-      this.title = '增加'
+      this.title = '新增设备'
+      this.ADD_disable = false
+      this.dialogFormVisible = true
     },
     submitEdit() {
-      console.log(2323)
+      this.ADD_disable = true
       editTable(this.equipmentSerialNumber, this.form.设备名称, this.form.设备型号, this.form.设备性能指标, this.form.设备加工能力, this.form.设备工时系数, this.form.班次类型, this.form.设备加工工艺, this.form.整改工时系数, this.form.设备编号, this.form.预留工时系数).then(response => {
         if (response.data[0].result === '1') {
           this.$notify({
@@ -360,6 +365,7 @@ export default {
           this.title = ''
           this.fetchData()
         } else {
+          this.ADD_disable = false
           this.$message.error('信息编辑失败')
         }
       })

src/views/Outsourcing/OutsourcingPartsQuery/index.vue

@@ -16,26 +16,27 @@
       </div>
     </el-card>
     <el-card>
-      <el-table v-loading="loading" :data="tableData" border stripe size="mini" height="650" style="width: 1350px">
+      <el-table v-loading="loading" :data="tableData" border stripe size="mini" height="650" style="width: 1480px">
-        <el-table-column label="序号" align="center" type="index" width="55"/>
+        <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="外协状态" align="center" width="80px">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.外协状态)==1" type="primary" size="mini">未提交</el-tag>
-            <el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)!==1" type="warning" size="mini">未到</el-tag>
+            <el-tag v-if="Number(scope.row.到货状态)===9" type="success" size="mini">未外协</el-tag>
-            <el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)===1" type="success" size="mini">已到</el-tag>
+            <el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)!==1" type="warning" size="mini">未到货</el-tag>
+            <el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)===1" type="success" size="mini">已到货</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="项目名称" align="center" width="130px">
+        <el-table-column label="项目名称" align="center" width="115px">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" align="center" width="160px">
+        <el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" align="center" width="120px">
+        <el-table-column label="零件名称" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -60,7 +61,7 @@
             {{ scope.row.加工价格_成交 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协厂家" align="center" width="160px">
+        <el-table-column label="外协厂家" align="center" width="140px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.外协厂家名称 }}
           </template>
@@ -75,6 +76,11 @@
             {{ scope.row.任务下达日期.split(' ')[0] }}
           </template>
         </el-table-column>
+        <el-table-column label="外协员" align="center" width="70" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.外协计划员 }}
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination

src/views/Outsourcing/PreorderAssociation/index.vue

@@ -21,7 +21,7 @@
         </el-select>
         <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:180px"/>
         <el-button size="small" icon="el-icon-search" type="primary" plain @click="pageSize1=50; pageCurrent1=1;searchTable()">查询</el-button>
-        <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName2" size="mini" highlight-current-row height="550px" border element-loading-text="拼命加载中" @row-click="searchTable2">
+        <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName2" empty-text="   " size="mini" highlight-current-row height="550px" border element-loading-text="拼命加载中" @row-click="searchTable2">
           <el-table-column label="零件图号" prop="零件图号" align="center" width="175px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
@@ -59,7 +59,7 @@
     <el-col style="width: auto">
       <el-card>
         <el-button :disabled="saveRowPrice_disable" size="small" type="success" plain style="margin: 10px" @click="saveRowPrice()">保存</el-button>
-        <el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" height="580" border element-loading-text="拼命加载中" size="small">
+        <el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" empty-text="   " height="580" border element-loading-text="拼命加载中" size="small">
           <el-table-column label="序号" type="index" align="center" width="50"/>
           <el-table-column label="加工状态" width="100" align="center">
             <template slot-scope="scope">

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>

src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue

@@ -59,6 +59,11 @@
                   {{ scope.row.备料任务分配时间 }}
                 </template>
               </el-table-column>
+              <el-table-column label="分配人" prop="分配人姓名" width="90" align="center" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.分配人姓名 }}
+                </template>
+              </el-table-column>
             </el-table>
             <div v-show="false" class="block">
               <el-pagination