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

src/api/ManufacturingCenter/SparePartsForScrap.js

@@ -64,7 +64,7 @@ export function editTime(CutCode, StartTime, FinishTime) {
     }
   })
 }
-export function editSpare(CutCode, number, reason, time) {
+export function editSpare(CutCode, number, reason, time, id) {
   return request({
     url: '',
     method: 'post',
@@ -73,7 +73,7 @@ export function editSpare(CutCode, number, reason, time) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间生产管理工艺_零件工艺计划_报废零件_增加数据',
-      param: '工艺计划流水号=' + CutCode + '&报废数量=' + number + '&报废原因=' + reason + '&报废时间=' + time
+      param: '工艺计划流水号=' + CutCode + '&报废数量=' + number + '&报废原因=' + reason + '&报废时间=' + time + '&报废人=' + id
     }
   })
 }

src/utils/tool.js

@@ -71,6 +71,51 @@ export function getNowTime1() {
   const time = date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
   return time
 }
+// 工时统计上个月26-本月25
+export function getTime26() {
+  const date = new Date()
+  const day = date.getDate()
+  if (day >= 25) {
+    var month = zeroFill(date.getMonth() + 1)
+    if (month === 0) {
+      month = 12
+      const day = 26
+      const time = date.getFullYear() - 1 + '-' + month + '-' + day
+      return time
+    } else {
+      const day = 26
+      const time = date.getFullYear() + '-' + month + '-' + day
+      return time
+    }
+  } else {
+    var month2 = zeroFill(date.getMonth() + 1) - 1
+    if (month2 === 0) {
+      month2 = 12
+      const day = 26
+      const time = date.getFullYear() - 1 + '-' + month2 + '-' + day
+      return time
+    } else {
+      const day = 26
+      const time = date.getFullYear() + '-' + month2 + '-' + day
+      return time
+    }
+  }
+}
+export function getTime25() {
+  const date = new Date()
+  const day = date.getDate()
+  if (day >= 25) {
+    const month = zeroFill(date.getMonth() + 2)
+    const day2 = 25
+    const time = date.getFullYear() + '-' + month + '-' + day2
+    return time
+  } else {
+    const month = zeroFill(date.getMonth() + 1)
+    const day2 = 25
+    const time = date.getFullYear() + '-' + month + '-' + day2
+    return time
+  }
+}
 // 判断类型
 export function type(target) {
   const ret = typeof (target)

src/views/ManufacturingCenter/CreatePreparationBill/index.vue

@@ -8,10 +8,10 @@
             <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
             <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/>
             <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为外购备料" placement="top">
-              <el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-left:10px" @click="edit2()">外购备料</el-button>
+              <el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-left: 50px" @click="edit2()">外购备料</el-button>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
-              <el-button type="distribution" size="small" icon="el-icon-setting" style="margin-left:10px" @click="edit('BL')">自家备料</el-button>
+              <el-button type="distribution" size="small" icon="el-icon-setting" style="margin-left:20px" @click="edit('BL')">自家备料</el-button>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
               <el-checkbox v-model="all" size="small">查询全部</el-checkbox>
@@ -42,11 +42,7 @@
         @sort-change="sortChange"
         @selection-change="handleSelectionChange">
         <!--<el-table v-loading="loading" :data="tableData" height="760" style="width: 1126px; margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">-->
-        <el-table-column
+        <el-table-column :selectable="checkboxT" type="selection" width="50" align="center"/>
-          :selectable="checkboxT"
-          type="selection"
-          width="50"
-          align="center"/>
         <el-table-column label="进程" prop="备料分配" align="center" width="70" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='0'" type="success" size="mini">自家</span>

src/views/ManufacturingCenter/ManHourStatistics/index.vue

@@ -139,11 +139,12 @@
 </template>
 <script>
 import { searchtable, searchTable2 } from '@/api/ManufacturingCenter/ManHourStatistics'
+import { getTime25, getTime26 } from '@/utils/tool'
 
 export default {
   data() {
     return {
-      dateRange: '',
+      dateRange: [],
       workerName: '',
       startTime: '',
       endTime: '',
@@ -156,6 +157,8 @@ export default {
     }
   },
   created() {
+    this.dateRange[0] = getTime26()
+    this.dateRange[1] = getTime25()
     this.searchTable()
   },
   methods: {

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -349,13 +349,13 @@
         <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-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="数量">
           <el-input
             v-model="form3.数量"
             size="small"
-            style="width:200px"/>
+            style="width:150px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -378,7 +378,7 @@
       :visible.sync="dialogFormVisible1"
       title="基本件打回信息"
       center
-      width="70%"
+      width="60%"
       style="min-height: 400px">
       <el-input v-model="partNumber" size="small" placeholder="零件图号及名称" style="width: 200px" clearable @change="PartCallbackInformation"/>
       <el-date-picker
@@ -401,7 +401,7 @@
       <el-table
         :data="tableData9"
         size="mini"
-        style="width: 97%;max-height: 300px"
+        style="width: 100%;max-height: 300px"
         height="400"
         highlight-current-row
         border
@@ -422,9 +422,9 @@
             {{ scope.row.材料 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件数量" width="120">
+        <el-table-column align="center" label="零件数量" width="150">
           <template slot-scope="scope">
-            <el-input-number v-model="scope.row.零件数量" :min="0" size="mini" style="width: 95px"/>
+            <el-input-number v-model="scope.row.零件数量" :min="0" size="mini" style="width: 120px"/>
           </template>
         </el-table-column>
         <el-table-column align="center" label="项目名称">
@@ -468,7 +468,7 @@
       :visible.sync="dialogFormVisible2"
       title="外购件和标准件打回信息"
       center
-      width="70%"
+      width="60%"
       style="min-height: 400px">
       <el-input v-model="partNumber1" size="small" placeholder="零件图号及名称" style="width: 200px" clearable @change="PartCallbackInformation1"/>
       <el-date-picker
@@ -491,7 +491,7 @@
       <el-table
         :data="tableData10"
         size="mini"
-        style="width: 97%;max-height: 300px"
+        style="width: 100%;max-height: 300px"
         height="400"
         highlight-current-row
         border
@@ -512,9 +512,9 @@
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件数量" width="120">
+        <el-table-column align="center" label="零件数量" width="150">
           <template slot-scope="scope">
-            <el-input-number v-model="scope.row.零件数量" :min="0" size="mini" style="width: 95px"/>
+            <el-input-number v-model="scope.row.零件数量" :min="0" size="mini" style="width: 120px"/>
           </template>
         </el-table-column>
         <el-table-column align="center" label="项目名称">
@@ -559,7 +559,9 @@
 <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 { mapGetters } from 'vuex'
+import { getNowShotTime } from '@/utils/tool'
 import Cookie from 'js-cookie'
+
 export default {
   inject: ['reload'],
   data() {
@@ -1036,6 +1038,7 @@ export default {
     },
     handleAdd() {
       this.addForm('form', [this.dialogFormVisible = true, this.title = '增加'])
+      this.form.请购时间 = getNowShotTime()
     },
     submitAdd(formName) {
       this.$refs[formName].validate((valid) => {

src/views/ManufacturingCenter/ProductionPlanQuery/index.vue

@@ -32,16 +32,7 @@
       </div>
     </div>
     <el-card>
-      <el-table
+      <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" height="570" style="width: 1000px; margin: 3px 0" size="mini" border highlight-current-row element-loading-text="拼命加载中">
-        v-loading="loading"
-        :data="tableData"
-        :row-class-name="tableRowClassName"
-        height="570"
-        style="width: 1000px; margin: 3px 0"
-        size="mini"
-        border
-        highlight-current-row
-        element-loading-text="拼命加载中">
         <el-table-column label="机床图号" prop="机床图号" align="center" width="140px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}

src/views/ManufacturingCenter/SparePartsForScrap/index.vue

@@ -10,7 +10,7 @@
         <!--:label="item.label"-->
         <!--:value="item.value"/>-->
         <!--</el-select>-->
-        <el-select v-model="MachineDrawingValue" placeholder="请选择机床图号" style="width:150px" clearable size="small" @change="fetchTeamDrawingData" @clear="Team = [];TeamValue = ''">
+        <el-select v-model="MachineDrawingValue" placeholder="请选择机床图号" style="width:150px" filterable clearable size="small" @change="fetchTeamDrawingData" @clear="Team = [];TeamValue = ''">
           <el-option
             v-for="item in MachineDrawing"
             :key="item.value"
@@ -124,7 +124,7 @@
               fixed="right"
             >
               <template slot-scope="scope">
-                <el-button :disabled="scope.row.批次零件状态 === '2'" type="text" size="mini" icon="el-icon-s-help" @click="handleEdit(scope.row)">报废</el-button>
+                <el-button :disabled="scope.row.批次零件状态 === '2'" type="text" size="mini" icon="el-icon-s-help" @click="handleEdit(scope.$index, scope.row)">报废</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -274,7 +274,7 @@
           <el-input v-model="form.input1" :disabled="true" auto-complete="off" size="small" style="width: 160px"/>
         </el-form-item>
         <el-form-item label="报废数量" prop="报废数量">
-          <el-input-number v-model="form2.报废数量" :step="1" :min="0" :max="PCNumber" size="small" style="width: 160px"/>
+          <el-input-number v-model="form2.报废数量" :step="1" :min="1" :max="PCNumber" size="small" style="width: 160px"/>
         </el-form-item>
         <el-form-item label="报废原因" prop="报废原因">
           <el-input v-model="form2.报废原因" auto-complete="off" size="small" style="width: 160px"/>
@@ -319,9 +319,11 @@
 
 <script>
 import { MachineDrawingSelect, TeamSelect, TableDataSelect, editSpare, TableDta2Select, editA } from '@/api/ManufacturingCenter/SparePartsForScrap'
+import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
+      index: 0,
       remark1: '',
       remark2: '',
       disabledB: false,
@@ -386,6 +388,14 @@ export default {
       inputD: 1
     }
   },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id' // 人员编号
+    ])
+  },
   created() {
     this.fetchMachineDrawingData()
     this.fetchTableData()
@@ -469,10 +479,12 @@ export default {
       this.currentPage2 = 1
       this.pageSize2 = 10
     },
-    handleEdit(row) {
+    handleEdit(index, row) {
       if (this.$refs['form2'] !== undefined) {
         this.$refs['form2'].resetFields()
       }
+      console.log(index)
+      this.index = index
       this.remark1 = ''
       this.remark2 = ''
       this.PCNumber = parseInt(row.批次数量)
@@ -486,11 +498,16 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.form2.报废数量 > 0) {
-            editSpare(this.code, this.form2.报废数量, this.form2.报废原因, this.form2.报废时间).then(response => {
+            editSpare(this.code, this.form2.报废数量, this.form2.报废原因, this.form2.报废时间, this.id).then(response => {
               if (response.data[0].result === '1') {
                 this.$message.success('报废成功')
                 this.dialogeditVisible = false
-                this.fetchTableData()
+                this.tableData[this.index].报废数量 = parseInt(this.tableData[this.index].报废数量) + parseInt(this.form2.报废数量)
+                this.tableData[this.index].批次数量 = this.tableData[this.index].批次数量 - this.form2.报废数量
+                if (this.tableData[this.index].批次数量 === 0) {
+                  this.tableData[this.index].批次零件状态 = '2'
+                }
+                // this.fetchTableData()
               } else {
                 this.$message.success('报废失败')
               }

src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue

@@ -5,7 +5,7 @@
       <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>-->
       <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 20px" plain @click="PageSize = 10;PageCurrent = 1;fetchData()">查询</el-button>
       <el-tooltip effect="dark" content="添加新设备" placement="top">
-        <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
+        <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">设备</el-button>
         <!--<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>-->
       </el-tooltip>
       <!--      <span style="margin-left: 40px">有效时间：</span>-->
@@ -111,8 +111,8 @@
     <!--      </el-tooltip>-->
     <!--    </el-card>-->
 
-    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
+    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
+      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="110px" class="demo-ruleForm">
         <el-row>
           <el-col :span = "12">
             <el-form-item label="设备名称" prop="设备名称" >
@@ -276,7 +276,7 @@ export default {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-      this.title = '新增车间设备'
+      this.title = '新增设备'
       this.form = {
         设备名称: '',
         设备编号: '',
@@ -295,7 +295,7 @@ export default {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-      this.title = '编辑'
+      this.title = '编辑设备'
       this.dialogFormVisible = true
       this.form.设备名称 = row.设备名称
       this.form.设备编号 = row.设备编号
@@ -310,12 +310,11 @@ export default {
       this.equipmentSerialNumber = row.设备流水号
     },
     submit(formName) {
-      console.log(this.title)
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.title === '增加') {
+          if (this.title === '新增设备') {
             this.submitAdd()
-          } else if (this.title === '编辑') {
+          } else if (this.title === '编辑设备') {
             this.submitEdit()
           }
         }

src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue

@@ -1,17 +1,17 @@
 <template>
   <div>
     <el-card>
-      <div style="width: 900px;margin: 3px auto">
+      <div style="width: 900px;margin-left: 375px">
-        <span>机床名称：</span>
+        <span>机床图号:</span>
-        <el-select v-model="machineValue" filterable clearable size="small" style="width: 200px;" placeholder="机床名称" @change="getGroups">
+        <el-select v-model="machineValue" filterable clearable size="small" placeholder="机床图号" style="margin-top: 3px;width: 200px;" @change="getGroups">
           <el-option
             v-for="item in machineNames"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span style="margin-left: 10px">分组名称：</span>
+        <span>分组名称:</span>
-        <el-select v-model="groupValue" filterable clearable size="small" style="width: 200px;" placeholder="分组名称">
+        <el-select v-model="groupValue" filterable clearable size="small" placeholder="分组名称" style="width: 100px;">
           <el-option
             v-for="item in groupsNames"
             :key="item.value"
@@ -21,14 +21,14 @@
         <el-tooltip :open-delay="1000" effect="dark" content="将系统中的三表信息传递到零件分配" placement="top">
           <el-button :loading="listLoading" :disabled="disabled" type="primary" plain icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
         </el-tooltip>
+        <el-row style="margin-top: 5px;margin-bottom: 3px">
+          <span>机床名称:</span>
+          <el-input v-model="machineName" readonly size="small" placeholder="机床名称" style="width: 200px;margin-right: 10px"/>
+          <span>机床数量:</span>
+          <el-input v-model="machineNum" readonly size="small" placeholder="机床数量" style="width: 100px;"/>
           <el-tooltip :open-delay="1000" effect="dark" content="删除三表中该组下的所有零件" placement="top">
-          <el-button type="danger" plain icon="el-icon-delete" size="small" style="margin-left: 10px" @click="allDelete">一键删除</el-button>
+            <el-button type="danger" icon="el-icon-delete" plain size="small" @click="allDelete">一键删除</el-button>
           </el-tooltip>
-        <el-row style="margin-top: 10px">
-          <span>机床名称：</span>
-          <el-input v-model="machineName" readonly size="small" placeholder="机床名称" style="width: 200px;"/>
-          <span style="margin-left: 10px">机床数量：</span>
-          <el-input v-model="machineNum" readonly size="small" placeholder="机床数量" style="width: 200px;"/>
         </el-row>
       </div>
     </el-card>

src/views/TechnologyCenter/ImportParts/specificationData.vue

@@ -133,7 +133,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col style="width: 39%">
+      <el-col style="width: 40%">
         <el-card>
           <el-table
             :data="tableData10"
@@ -635,6 +635,10 @@ export default {
               const groupIndex = this.machineNames.indexOf(this.machineValue)
               this.machineNames.splice(groupIndex, 1)
             }
+            this.machineValue = ''
+            this.groupValue = ''
+            this.machineName = ''
+            this.machineNum = ''
             this.$message.success(`传递成功`)
             this.tableDataAll = []
             this.tableData = []

src/views/TechnologyCenter/PartDrawingMaintenance/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-card style="width: 580px">
+    <el-card style="width: 645px">
-      <el-row style="width: 580px">
+      <el-row style="width: 645px">
         <el-input v-model="partNumber" placeholder="零件图号" style="width: 180px" size="small" clearable/>
         <el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
         <el-upload
@@ -18,8 +18,8 @@
         </el-upload>
       </el-row>
     </el-card>
-    <el-card style="width: 580px">
+    <el-card style="width: 645px">
-      <el-table v-loading="loading" :data="tableData" border size="mini" style="width: 555px;height: 700px" height="520">
+      <el-table v-loading="loading" :data="tableData" border size="mini" style="width: 635px;height: 700px" height="520">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="零件图号" align="center" width="180px">
           <template slot-scope="scope">
@@ -31,11 +31,16 @@
             {{ scope.row.suffix }}
           </template>
         </el-table-column>
-        <el-table-column label="上传时间" align="center" width="150px">
+        <el-table-column label="导入时间" align="center" width="140px">
           <template slot-scope="scope">
             {{ scope.row.上传时间.split(' ')[0] }}
           </template>
         </el-table-column>
+        <el-table-column label="导入人" align="center" width="90px">
+          <template slot-scope="scope">
+            {{ scope.row.导入人 }}
+          </template>
+        </el-table-column>
         <el-table-column width="80px" label="零件图纸" align="center">
           <template slot-scope="scope">
             <el-button circle icon="el-icon-search" size="small" @click="getNum(scope.row)"/>
@@ -78,6 +83,7 @@
 import request from '@/utils/request'
 import { getTableData } from '@/api/TechnologyCenter/PartDrawingMaintenance'
 import { MESUploadFile, MESDownloadFile } from '@/utils/request'
+import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
@@ -98,6 +104,14 @@ export default {
       fileList: []
     }
   },
+  computed: {
+    ...mapGetters([
+      'token',
+      'sidebar',
+      'name',
+      'id' // 人员编号
+    ])
+  },
   created() {
     this.getTableData()
   },
@@ -123,7 +137,7 @@ export default {
     },
     // 上传
     batchImportOfDrawings() {
-      this.action = `${MESUploadFile}?&num=1&tableName=机加工MES_零件图PDF表&type=1`
+      this.action = `${MESUploadFile}?&num=1&tableName=机加工MES_零件图PDF表&type=1&UploaderName=${this.id}`
     },
     uploadSuccess(res, file, fileList) {
       this.getTableData()