更新

src/api/Inventory/MaterialOut.js

@@ -99,20 +99,6 @@ export function searchStockNumber2(...params) {
     }
   })
 }
-// 查看领料单明细相关的物料货位数量
-export function searchStockNumber3(...params) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '库存管理_物料出库_车间采购件_查询数据',
-      param: `请购单明细流水号=${params[0]}`
-    }
-  })
-}
 // 出库
 export function submitOutStore(...params) {
   return request({

src/api/ManufacturingCenter/DiscardedPartsInquiry.js

@@ -67,7 +67,7 @@ export function searchTable1(num) {
     }
   })
 }
-export function searchTable2(check1, machineNameValue, pageCurrent1, pageSize1) {
+export function searchTable2(check1, machineNameValue, check2, time1, time2, pageCurrent1, pageSize1) {
   return request({
     url: '',
     method: 'post',
@@ -76,8 +76,21 @@ export function searchTable2(check1, machineNameValue, pageCurrent1, pageSize1)
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理工艺_传递后_零件报废补投_查询数据_按机床查询',
-      param: '机床流水号_check=' + check1 + '&机床流水号=' + machineNameValue,
+      param: '机床流水号_check=' + check1 + '&机床流水号=' + machineNameValue + '&报废日期_check=' + check2 + '&开始时间=' + time1 + '&结束时间=' + time2,
       pagination: pageCurrent1 + '&' + pageSize1
     }
   })
 }
+export function TableDta2Select(CutCode) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_报废零件记录_查询工序',
+      param: '补投流水号=' + CutCode
+    }
+  })
+}

src/api/ManufacturingCenter/InitialProduction.js

@@ -145,21 +145,21 @@ export function revisionBatch(num, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o,
   })
 }
 // 编辑
-export function editList(num, a, b, c) {
+export function editList(num, a, b, c, d) {
   return request({
     url: '',
     method: 'post',
     data: {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
-      type: '2',
+      type: '1',
       name: '车间生产管理工艺_零件工艺计划_修改批次数量',
-      param: '工艺计划流水号=' + num + '=int&批次数量=' + a + '=string&机加工开始时间=' + b + '=string&机加工结束时间=' + c + '=string'
+      param: '工艺计划流水号=' + num + '=int&批次数量=' + a + '=string&机加工开始时间=' + b + '=string&机加工结束时间=' + c + '=string&批次数量中间值=' + d + '=string'
     }
   })
 }
 // 编辑
-export function EditNumber(num, num1) {
+export function EditNumber(num, num1, num2) {
   return request({
     url: '',
     method: 'post',
@@ -168,7 +168,7 @@ export function EditNumber(num, num1) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间生产管理工艺_生产计划下达_修改投产数量',
-      param: '组件零件基本件流水号=' + num + '=int&数量=' + num1
+      param: '组件零件基本件流水号=' + num + '=int&数量=' + num1 + '=int&已投数量=' + num2
     }
   })
 }
@@ -213,3 +213,42 @@ export function searchUrgentItem() {
     }
   })
 }
+export function addUrgentItem(machineValue, groupValue, partValue, partName, Guide, partMumber, basic, ID, b, c, d, e, f, g, h, i, j, k) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: 'PDM_零件明细表_加急件_增加',
+      param: `图号或者型号=${partValue}&零件名称=${partName}&规格=${Guide}&零件数量=${partMumber}&零件备注=${basic}&机床流水号=${machineValue}&组件流水号=${groupValue}&加件人流水号=${ID}&计划开始时间=${b}&计划结束时间=${c}&工艺计划开始时间=${d}&工艺计划结束时间=${e}&定额计划开始时间=${f}&定额计划结束时间=${g}&计划编制计划开始时间=${h}&计划编制计划结束时间=${i}&机加工开始时间=${j}&机加工结束时间=${k}`
+    }
+  })
+}
+export function machineSelect() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: 'PDM_项目名称_查询数据'
+    }
+  })
+}
+
+export function groupSelect(machineValue) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: 'PDM_零件明细表_组件流水号_查询数据_根据机床',
+      param: `机床流水号=${machineValue}`
+    }
+  })
+}

src/api/TechnologyCenter/QueryParts.js

@@ -107,16 +107,3 @@ export function getFileData(MachineDrawValue) {
     }
   })
 }
-export function addUrgentItem(groupValue, partValue, partName, partMumber, basic, ID) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '2',
-      name: 'PDM_零件明细表_加急件_增加',
-      param: `图号或者型号=${partValue}&零件名称=${partName}&零件数量=${partMumber}&零件备注=${basic}&组件流水号=${groupValue}&加件人流水号=${ID}`
-    }
-  })
-}

src/utils/request.js

@@ -17,7 +17,7 @@ export const download = `http://123.56.95.229:8010/submit/downloadFile.ashx` //
 export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx`
 export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx`
 export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESDownloadExcel.ashx' // 导出excel
+export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESCommonBase.ashx' // 导出excel
 // 技术中心程序发布时要更改下面所有的IP到0段
 export const ServerIP = `http://123.56.95.229:8010/webpage/file/`
 export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231

src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card>
+    <el-card style="width: 1255px">
       <el-row>
         <!--<span>项目名称:</span>-->
         <!--<el-select-->
@@ -20,63 +20,76 @@
         <!--:label="item.label"-->
         <!--:value="item.value"/>-->
         <!--</el-select>-->
-        <span>机床图号:</span>
-        <el-select v-model="machineNameValue" placeholder="机床图号" style="margin-right: 10px; width: 150px" size="small" filterable clearable @change="machineChange">
+        <el-select v-model="machineNameValue" placeholder="机床图号" style="width: 150px" size="small" filterable clearable @change="machineChange">
           <el-option
             v-for="item in machineName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 15px" @click="total=0;pageSize = 20;pageCurrent = 1;searchData1()">查询</el-button>
+        <el-date-picker
+          v-model="outTime"
+          type="daterange"
+          size="small"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          range-separator="~"
+          style="width:240px;margin-left: 10px"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;searchData1()">查询</el-button>
+        <el-button type="success" icon="el-icon-download" size="small" plain style="margin-left: 10px" @click="exportExcel()">导出</el-button>
       </el-row>
     </el-card>
-    <el-card style="margin-top: 15px;width: 960px">
+    <el-row>
+      <el-col style="width: 825px">
+        <el-card style="margin-top: 15px;width: 825px">
           <el-table
             v-loading="listLoading"
             :data="tableData"
             style="width: 100%"
             stripe
             size="small"
-        height="660"
+            height="590"
             highlight-current-row
-        border>
-        <el-table-column align="center" label="机床图号" width="150px">
+            border
+            @row-click="fetchTableData2">
+            <el-table-column align="center" label="机床图号" width="120px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
             </el-table-column>
-        <el-table-column align="center" label="组号" width="80px">
+            <el-table-column align="center" label="组号" width="50px">
               <template slot-scope="scope">
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-        <el-table-column align="center" label="零件图号" width="140px">
+            <el-table-column align="center" label="零件图号" width="173px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-        <el-table-column align="center" label="零件名称" width="120px">
+            <el-table-column align="center" label="零件名称" width="129px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
             </el-table-column>
-        <el-table-column align="center" label="报废数量" width="70px">
+            <el-table-column align="center" label="报废数" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.报废数量 }}
               </template>
             </el-table-column>
-        <el-table-column align="center" label="报废时间" width="100px">
+            <el-table-column align="center" label="报废时间" width="85px">
               <template slot-scope="scope">
                 {{ scope.row.报废时间 }}
               </template>
             </el-table-column>
-        <el-table-column align="center" label="报废原因" width="180px">
+            <el-table-column align="center" label="报废原因" width="140px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.报废原因 }}
               </template>
             </el-table-column>
-        <el-table-column align="center" label="报废工时" width="90px">
+            <el-table-column align="center" label="报废工时(分)" width="105px">
               <template slot-scope="scope">
                 {{ scope.row.报废工时 }}
               </template>
@@ -93,11 +106,78 @@
               @current-change="handleCurrentChange"/>
           </div>
         </el-card>
+      </el-col>
+      <el-col style="width: 430px">
+        <el-card>
+          <el-table
+            :data="tableData2"
+            element-loading-text="拼命加载中"
+            element-loading-spinner="el-icon-loading"
+            element-loading-background="rgba(226,223,223,1)"
+            height="630"
+            border
+            style="width: 430px">
+            <el-table-column
+              width="50px"
+              prop="province1"
+              label="顺序"
+              align="center"
+            >
+              <template slot-scope="scope">{{ scope.row.工序顺序 }}</template>
+            </el-table-column>
+            <el-table-column
+              width="80px"
+              prop="province2"
+              label="工艺名称"
+              align="center"
+            >
+              <template slot-scope="scope">{{ scope.row.工艺名称 }}</template>
+            </el-table-column>
+            <el-table-column
+              prop="province4"
+              label="工艺要求"
+              align="center"
+              width="80px"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">{{ scope.row.工艺要求 }}</template>
+            </el-table-column>
+            <el-table-column
+              width="60px"
+              prop="province5"
+              label="单件定额"
+              align="center"
+            >
+              <template slot-scope="scope">{{ scope.row.单件定额工时 }}</template>
+            </el-table-column>
+            <el-table-column
+              width="60px"
+              prop="province6"
+              label="准结定额"
+              align="center"
+            >
+              <template slot-scope="scope">{{ scope.row.准结定额工时 }}</template>
+            </el-table-column>
+            <el-table-column
+              width="77px"
+              prop="province7"
+              label="完成状态"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <div v-if="scope.row.工序状态 === 4"><div style="width: 12px;height: 12px;border-radius: 50%;background-color: rgb(103, 194, 58);display: inline-block;margin:0px 5px 0 0"/>完成</div>
+                <div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>未完</div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
 <script>
-import { searchMachine, searchTable1, searchTable2 } from '@/api/ManufacturingCenter/DiscardedPartsInquiry'
+import { searchMachine, searchTable1, searchTable2, TableDta2Select } from '@/api/ManufacturingCenter/DiscardedPartsInquiry'
 export default {
   data() {
     return {
@@ -106,6 +186,7 @@ export default {
       total: 0,
       list: [],
       check3: '',
+      outTime: '',
       PartDrawingNumber: '',
       remoteLoading: false,
       listLoading: false,
@@ -155,13 +236,41 @@ export default {
       } else {
         this.check1 = 0
       }
-      searchTable2(this.check1, this.machineNameValue, this.pageCurrent, this.pageSize).then(response => {
-        console.log(response)
+      let check7
+      this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
+      searchTable2(this.check1, this.machineNameValue, check7, this.outTime[0], this.outTime[1], this.pageCurrent, this.pageSize).then(response => {
         this.tableData = response.data.rows
         this.total = response.data.total
         this.listLoading = false
       })
     },
+    fetchTableData2(row) {
+      TableDta2Select(row.补投流水号).then(response => {
+        this.tableData2 = response.data
+      })
+    },
+    exportExcel() {
+      if (this.machineNameValue !== '' && this.machineNameValue !== null) {
+        this.check1 = 1
+      } else {
+        this.check1 = 0
+      }
+      let check7
+      this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
+      var param = []
+      param[0] = ['机床流水号_check', this.check1]
+      param[1] = ['机床流水号', this.machineNameValue]
+      param[2] = ['报废日期_check', check7]
+      if (check7 === 0) {
+        param[3] = ['开始时间', '']
+        param[4] = ['结束时间', '']
+      } else {
+        param[3] = ['开始时间', this.outTime[0]]
+        param[4] = ['结束时间', this.outTime[1]]
+      }
+      var Data = this.CreateData('2001', '报表_报废零件查询', param)
+      this.exportExcel_NPOI(Data)
+    },
     handleSizeChange(val) {
       this.pageSize = val
       this.pageCurrent = 1

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -102,7 +102,7 @@
           <el-table-column
             type="selection"
             align="center"
-            width="35"/>
+            width="45"/>
           <el-table-column label="零件号" prop="零件图号" align="center" min-width="150">
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
@@ -123,7 +123,7 @@
               {{ scope.row.投产总数量 }}
             </template>
           </el-table-column>
-          <el-table-column label="批次" align="center">
+          <el-table-column label="批数" align="center">
             <template slot-scope="scope">
               {{ scope.row.最大投产批次 }}
             </template>
@@ -179,6 +179,7 @@
             layout="total, sizes, prev, pager, next, jumper"
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"/>
+          <el-button icon="el-icon-circle-plus-outline" type="distribution" size="small" @click="openUrgentItem()">加急件</el-button>
           <el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
             <el-button :loading="listLoading3" type="danger" size="small" style="float:right;margin-left: 10px" plain @click="back">打回</el-button>
           </el-tooltip>
@@ -216,14 +217,6 @@
             label="零件名称" >
             <template slot-scope="scope">{{ scope.row.零件名称 }}</template>
           </el-table-column>
-          <el-table-column
-            label="投产总数量">
-            <template slot-scope="scope">{{ scope.row.投产总数量 }}</template>
-          </el-table-column>
-          <el-table-column
-            label="未投产数量">
-            <template slot-scope="scope">{{ scope.row.未投产数量 }}</template>
-          </el-table-column>
           <el-table-column
             label="投产批次">
             <template slot-scope="scope">{{ scope.row.投产批次 }}</template>
@@ -232,6 +225,10 @@
             label="批次数量">
             <template slot-scope="scope">{{ scope.row.批次数量 }}</template>
           </el-table-column>
+          <el-table-column
+            label="投产时间">
+            <template slot-scope="scope">{{ scope.row.操作时间 }}</template>
+          </el-table-column>
           <!--<el-table-column-->
           <!--label="是否外协">-->
           <!--<template slot-scope="scope">{{ scope.row.是否外协 }}</template>-->
@@ -288,7 +285,7 @@
     <el-dialog :visible.sync="dialogFormVisible3" title="更改投产数量" center width="300px">
       <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" />
+          <el-input-number v-model="form3.投产数量" :min="AlreadyCastNumber" :step="1" size="small" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -300,16 +297,16 @@
     <el-dialog :title="title" :visible.sync="dialogFormVisible1" center width="450px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-form-item label="零件图号" prop="PDnumber">
-          <el-input v-model="form.PDnumber" size="small" readonly style="width:250px" />
+          <el-input v-model="form.PDnumber" size="small" disabled style="width:250px" />
         </el-form-item>
         <el-form-item label="投产总数量" prop="quantity">
-          <el-input v-model="form.quantity" size="small" readonly style="width:250px" />
+          <el-input v-model="form.quantity" size="small" disabled style="width:250px" />
         </el-form-item>
         <el-form-item label="未投产数量" prop="unputquantity">
-          <el-input v-model="form.unputquantity" size="small" readonly style="width:250px"/>
+          <el-input v-model="form.unputquantity" size="small" disabled style="width:250px"/>
         </el-form-item>
         <el-form-item label="投产批次" prop="productionBatch">
-          <el-input v-model="form.productionBatch" size="small" readonly style="width:250px" placeholder="请输入投产批次"/>
+          <el-input v-model="form.productionBatch" size="small" disabled style="width:250px" placeholder="请输入投产批次"/>
         </el-form-item>
         <el-form-item v-show="temp === 1" label="批次数量1" prop="batchQuantity">
           <el-input-number v-model="form.batchQuantity" :min="1" :max="parseInt(form.unputquantity)" size="small" style="width:250px" label="批次数量"/>
@@ -321,7 +318,7 @@
           <el-date-picker
             v-model="form.startDate_F"
             size="small"
-            readonly
+            disabled
             type="date"
             value-format="yyyy-MM-dd"
             style="top: 1px;width:250px"
@@ -347,11 +344,53 @@
       </el-form>
     </el-dialog>
 
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible10" title="添加加急件" center style="min-height: 300px" width="500px">
+      <el-form ref="form10" :model="form10" :rules="rules10" label-position="left" label-width="100px" class="demo-ruleForm">
+        <el-form-item label="机床号" prop="机床号" style="margin-left: 70px">
+          <el-select v-model="form10.机床号" placeholder="选择机床" filterable clearable size="small" style="width:200px" @change="getGroupSelect1">
+            <el-option
+              v-for="item in machine"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="组号" prop="组号" style="margin-left: 70px">
+          <el-select v-model="form10.组号" placeholder="选择组号" filterable clearable size="small" style="width:200px">
+            <el-option
+              v-for="item in group1"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="零件图号" prop="零件图号" style="margin-left: 70px">
+          <el-input v-model="form10.零件图号" placeholder="零件图号" size="small" style="width:200px" clearable/>
+        </el-form-item>
+        <el-form-item label="零件名称" prop="零件名称" style="margin-left: 70px">
+          <el-input v-model="form10.零件名称" placeholder="零件名称" size="small" style="width:200px" clearable/>
+        </el-form-item>
+        <el-form-item label="规格" style="margin-left: 70px">
+          <el-input v-model="form10.规格" placeholder="规格" size="small" style="width:200px" clearable/>
+        </el-form-item>
+        <el-form-item label="零件数量" prop="零件数量" style="margin-left: 70px">
+          <el-input-number v-model="form10.零件数量" :step="1" :min="0" size="mini" style="width:200px"/>
+        </el-form-item>
+        <el-form-item label="零件备注" prop="零件备注" style="margin-left: 70px">
+          <el-input v-model="form10.零件备注" placeholder="零件备注" size="small" style="width:200px" clearable/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="callOff('form10')">取消</el-button>
+        <el-button type="primary" @click="submit10('form10')">确定</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { getEntryNameValue, getToolNum, getNum, getTable, production, getTable1, revisionBatch, editList, dele, production2, production20, production10, edit, EditNumber } from '@/api/ManufacturingCenter/InitialProduction'
+import { machineSelect, groupSelect, getToolNum, getNum, getTable, production, getTable1, revisionBatch, editList, dele, production2, production20, production10, edit, EditNumber, addUrgentItem } from '@/api/ManufacturingCenter/InitialProduction'
 import { mapGetters } from 'vuex'
 import Cookie from 'js-cookie'
 
@@ -365,6 +404,9 @@ export default {
       clearTable: 0,
       readonly: true,
       gongyirenwuzhuangtai: '',
+      machine: [],
+      group1: [],
+      NUMBER10: '',
       count: 0, // 表单计数器
       count2: 0,
       count3: 0,
@@ -380,7 +422,9 @@ export default {
       TypeflowNumber: '',
       dataType: '', // 数据类型
       productionQuantity: '', // 投产总数量
+      AlreadyCastNumber: 0, // 已投产数量
       checked_waixie1: '',
+      piciNumber: '',
       MaterialflowNumber: '', // 材料流水号
       checked_zhaoji1: '',
       time_planStart: '',
@@ -393,6 +437,7 @@ export default {
       time_planpinghengStart: '',
       time_machiningFinish: '',
       time_machiningStart: '',
+      time: '',
       form: { // 修改表单
         PDnumber: '',
         quantity: '',
@@ -403,6 +448,22 @@ export default {
         startDate_F: '',
         endDate_F: ''
       },
+      form10: {
+        机床号: '',
+        组号: '',
+        零件图号: '',
+        零件名称: '',
+        规格: '',
+        零件数量: '',
+        零件备注: ''
+      },
+      rules10: {
+        机床号: [{ required: true, message: '请选择机床', trigger: 'change' }],
+        组号: [{ required: true, message: '请选择组号', trigger: 'change' }],
+        零件图号: [{ required: true, message: '请输入零件图号', trigger: 'blur' }],
+        零件名称: [{ required: true, message: '请输入零件名称', trigger: 'blur' }],
+        零件数量: [{ required: true, message: '请输入零件数量', trigger: 'blur' }]
+      },
       form1: {
         reason: ''
       },
@@ -423,6 +484,7 @@ export default {
       dialogFormVisible1: false,
       dialogFormVisible2: false,
       dialogFormVisible3: false,
+      dialogFormVisible10: false,
       NumberValue: '',
       date: '',
       a: false,
@@ -483,6 +545,7 @@ export default {
     this.typeChange()
     this.getCurrentTime()
     this.getNowTime()
+    this.fetchData()
   },
   methods: {
     gaibianwaixie(index, row) {
@@ -508,6 +571,7 @@ export default {
       this.time_planpinghengFinish = this.getTime0(3)
       this.time_planpinghengStart = this.getTime0(2)
       this.time_machiningStart = this.getTime0(3)
+      this.time = this.getTime0(5)
       const _this = this
       setTimeout(() => {
         _this.getCurrentTime()
@@ -541,14 +605,17 @@ export default {
     },
     // 初始化获取项目名称
     fetchData() {
-      getEntryNameValue().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.entryName.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
-          })
+      this.getSelect(machineSelect, ['机床图号', '机床流水号'], 'machine')
+    },
+    getGroupSelect1() {
+      this.form10.组号 = ''
+      this.getSelect(groupSelect, ['组号', '组件流水号'], 'group1', this.form10.机床号)
+    },
+    openUrgentItem() {
+      if (this.$refs['form10'] !== undefined) {
+        this.$refs['form10'].resetFields()
       }
-      })
+      this.dialogFormVisible10 = true
     },
     typeChange() {
       console.log(Cookie.get('machineValue'), 1111111)
@@ -632,6 +699,20 @@ export default {
         })
       }
     },
+    submit10(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          addUrgentItem(this.form10.机床号, this.form10.组号, this.form10.零件图号, this.form10.零件名称, this.form10.规格, this.form10.零件数量, this.form10.零件备注, this.id, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('添加成功')
+              this.dialogFormVisible10 = false
+            } else {
+              this.$message.error('添加失败')
+            }
+          })
+        }
+      })
+    },
     // 点击Table查询设备信息
     handleCurrentChange1(row) {
       this.tableData1 = []
@@ -655,9 +736,10 @@ export default {
       console.log(row, 123)
       this.NumberValue = row.组件零件基本件流水号
       this.form3.投产数量 = row.投产总数量
+      this.AlreadyCastNumber = row.已投产数量 ? parseInt(row.已投产数量) : 0
     },
     EditNumber() {
-      EditNumber(this.NumberValue, this.form3.投产数量).then(response => {
+      EditNumber(this.NumberValue, this.form3.投产数量, this.AlreadyCastNumber).then(response => {
         if (response.data[0].result === '1') {
           this.getTable()
           this.dialogFormVisible3 = false
@@ -733,6 +815,7 @@ export default {
       this.checked_zhaoji1 = row.checked_zhaoji
       this.form.batchQuantity2 = parseInt(row.批次数量)
       this.form.batchQuantity = parseInt(row.批次数量)
+      this.piciNumber = parseInt(row.批次数量)
       this.gongyijihua = row.工艺计划流水号
       this.form.unputquantity = row.投产总数量 - row.已投产数量
       for (let i = 0; i < tableData.length; i++) {
@@ -753,26 +836,35 @@ export default {
       } else {
         this.temp = null
         if (this.gongyirenwuzhuangtai === '1') {
-          editList(this.gongyijihua, this.form.batchQuantity2, this.form.startDate_F, this.form.endDate_F).then(response => {
-            if (response.data[0].result === '1') {
+          editList(this.gongyijihua, this.form.batchQuantity2, this.form.startDate_F, this.form.endDate_F, this.piciNumber).then(response => {
+            if (response.data.hasOwnProperty('result') === false) {
               this.dialogFormVisible1 = false
+              this.NUMBER10 = response.data[0].已投产数量
               this.$message({
                 type: 'success',
                 message: '信息更新成功!'
               })
+              if (parseInt(this.productionQuantity) === this.NUMBER10) {
+                this.tableData1 = []
+                this.total3 = 0
+                this.listLoading1 = false
+              } else {
                 getTable1(this.midcode, this.pageList3, this.pageSize3).then(response => {
                   this.total3 = parseInt(response.data.total)
                   this.tableData1 = response.data.rows
                   this.listLoading1 = false
                 })
+              }
               this.total = 0
               this.pageSize = 10000
               this.pageList = 1
               this.getTable()
             } else {
+              if (response.data[0].result === '0') {
                 this.dialogFormVisible1 = false
                 this.$message.error('信息更新失败')
               }
+            }
           })
         } else {
           this.dialogFormVisible1 = false
@@ -1198,6 +1290,7 @@ export default {
     // 重置表单
     callOff(formName) {
       this.dialogFormVisible1 = false
+      this.dialogFormVisible10 = false
       this.$refs[formName].resetFields()
     },
     submit1(formName) {

src/views/ManufacturingCenter/MaterialArrival/index.vue

@@ -22,7 +22,7 @@
           </el-select>
           <el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
           <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
-          <el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
+          <el-button :disabled="Name===0" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
         </el-card>
         <el-row>
           <el-card style="width: 850px; margin-left: 0px;display: inline-block;" >
@@ -283,6 +283,7 @@ export default {
       this.processSerialNumber = ''
       this.radio = true
       this.tableData1 = []
+      this.Name = 0
       this.row2 = row
       gettabledata1(row.工艺计划流水号).then(response => {
         if (response.data.length !== 0) {
@@ -345,7 +346,9 @@ export default {
     },
     getRow(row) {
       this.processSerialNumber = row.工序流水号
-      row.完成日期 ? this.Name = 1 : this.Name = 0
+      console.log(row.完成日期, 222)
+      row.完成日期 ? this.Name = 0 : this.Name = 1
+      console.log(this.Name, 111)
     },
     handleSizeChange(val) {
       this.pageSize = val

src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue

@@ -23,7 +23,7 @@
       <el-button :loading="loading" type="success" size="small" icon="el-icon-upload" style="margin-left: 300px" plain @click="currency">通用件保存</el-button>
     </el-card>
     <el-card>
-      <el-table ref="multipleTable" :data="tableData" style="width: 1000px;" size="mini" height="750" highlight-current-row border @selection-change="handleSelectionChange" @row-click="rowClick">
+      <el-table ref="multipleTable" :data="tableData" :row-class-name="tableRowClassName1" style="width: 1000px;" size="mini" height="750" highlight-current-row border @selection-change="handleSelectionChange" @row-click="rowClick">
         <el-table-column align="center" type="selection"/>
         <el-table-column align="center" label="零件号" prop="零件号">
           <template slot-scope="scope">
@@ -308,6 +308,12 @@ export default {
         }
       }
     },
+    tableRowClassName1({ row }) {
+      console.log(row)
+      if (row.是否加急 === '1') {
+        return 'isUrgentItem'
+      }
+    },
     // 分页
     handleSizeChange(val) {
       this.PageCurrent = 1
@@ -327,3 +333,8 @@ export default {
    margin-right: 10px;
   }
 </style>
+<style>
+  .el-table .isUrgentItem{
+    background: #FF9797;
+  }
+</style>

src/views/ManufacturingCenter/SparePartsForScrap/index.vue

@@ -1,7 +1,7 @@
 <!--零件报废补投-->
 <template>
   <div class="app-container">
-    <el-card>
+    <el-card style="width: 1360px">
       <el-row>
         <!--<el-select v-model="ProjectNameValue" placeholder="请选择项目名称" style="width:150px;margin-bottom: 3px" clearable size="small" @change="fetchMachineDrawingData" @clear="MachineDrawingValue = '';MachineDrawing = [];Team = [];TeamValue = ''">-->
         <!--<el-option-->
@@ -10,34 +10,35 @@
         <!--:label="item.label"-->
         <!--:value="item.value"/>-->
         <!--</el-select>-->
-        <el-select v-model="MachineDrawingValue" placeholder="请选择机床图号" style="width:150px;margin: 0px 10px" clearable size="small" @change="fetchTeamDrawingData" @clear="Team = [];TeamValue = ''">
+        <el-select v-model="MachineDrawingValue" placeholder="请选择机床图号" style="width:150px" clearable size="small" @change="fetchTeamDrawingData" @clear="Team = [];TeamValue = ''">
           <el-option
             v-for="item in MachineDrawing"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-select v-model="TeamValue" placeholder="请选择组号" style="width:150px; margin: 0px 10px" clearable size="small">
+        <el-select v-model="TeamValue" placeholder="请选择组号" style="width:150px;margin-left: 10px" clearable size="small">
           <el-option
             v-for="item in Team"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="PartDrawing" placeholder="请输入零件图号" size="small" style="width: 150px; margin: 0px 10px" clearable/>
+        <el-input v-model="PartDrawing" placeholder="请输入零件图号" size="small" style="width: 150px;margin-left: 10px" clearable/>
         <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="currentPage1=1; fetchTableData()">查询</el-button>
       </el-row>
     </el-card>
     <el-row>
       <el-col style="width: 850px">
-        <el-card style="width: 850px">
+        <el-card style="width: 845px">
           <el-table
             v-loading="loading"
             :data="tableData"
+            :row-class-name="tableRowClassName1"
             element-loading-text="拼命加载中"
             element-loading-spinner="el-icon-loading"
             element-loading-background="rgba(226,223,223,1)"
-            height="600"
+            height="520"
             highlight-current-row
             border
             stripe
@@ -47,7 +48,7 @@
               align="center"
               prop="零件图号"
               label="零件号"
-              width="150px"
+              width="173px"
               show-overflow-tooltip
             >
               <template slot-scope="scope">{{ scope.row.零件图号 }}</template>
@@ -56,7 +57,7 @@
               align="center"
               prop="零件名称"
               label="零件名称"
-              width="140px"
+              width="129px"
               show-overflow-tooltip
             >
               <template slot-scope="scope">{{ scope.row.零件名称 }}</template>
@@ -64,7 +65,16 @@
             <el-table-column
               align="center"
               prop="province4"
-              label="批次数量"
+              label="投产数量"
+              width="80px"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">{{ scope.row.投产数量 }}</template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="province4"
+              label="在产数量"
               width="80px"
               show-overflow-tooltip
             >
@@ -91,21 +101,12 @@
             <el-table-column
               align="center"
               prop="province5"
-              label="开始时间"
-              width="100px"
+              label="计划开始时间"
+              width="110px"
               show-overflow-tooltip
             >
               <template slot-scope="scope">{{ scope.row.机加工开始时间 }}</template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              prop="province6"
-              label="结束时间"
-              width="100px"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">{{ scope.row.机加工结束时间 }}</template>
-            </el-table-column>
             <!--            <el-table-column-->
             <!--              align="center"-->
             <!--              prop="province7"-->
@@ -121,6 +122,7 @@
               align="center"
               label="操作"
               width="80px"
+              fixed="right"
             >
               <template slot-scope="scope" >
                 <el-button :disabled="scope.row.批次零件状态 === '2'" type="primary" plain size="mini" @click="handleEdit(scope.row)">报废</el-button>
@@ -147,7 +149,7 @@
             element-loading-text="拼命加载中"
             element-loading-spinner="el-icon-loading"
             element-loading-background="rgba(226,223,223,1)"
-            height="600"
+            height="520"
             border
             style="width: 510px">
             <el-table-column
@@ -159,7 +161,7 @@
               <template slot-scope="scope">{{ scope.row.工序顺序 }}</template>
             </el-table-column>
             <el-table-column
-              width="80px"
+              width="87px"
               prop="province2"
               label="工艺名称"
               align="center"
@@ -198,7 +200,7 @@
             >
               <template slot-scope="scope">
                 <div v-if="scope.row.工序状态 === '4'"><div style="width: 12px;height: 12px;border-radius: 50%;background-color: rgb(103, 194, 58);display: inline-block;margin:0px 5px 0 0"/>完成</div>
-                <div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>未完成</div>
+                <div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>未完</div>
               </template>
             </el-table-column>
           </el-table>
@@ -215,7 +217,7 @@
         </el-card>
       </el-col>
     </el-row>
-    <el-card>
+    <el-card style="width: 1360px">
       <div style="margin-top: 10px">报废后,补投的零件号后加B+报废次数</div>
       <!--<div style="margin-top: 10px; display: block">-->
       <!--<span>补投接着加工零件数量</span>-->
@@ -419,8 +421,8 @@ export default {
         this.spareNumber = row.报废数量
         this.inputC = 0
         this.SupplementationNumber = row.补投数量
+        this.inputC = row.报废数量 - row.补投数量
         this.CutCodeBefore = row.工艺计划流水号
-        console.log(this.CutCodeBefore, 222)
         TableDta2Select(row.工艺计划流水号, this.currentPage2, this.pageSize2).then(response => {
           this.tableData2 = response.data.rows
           this.total2 = response.data.total
@@ -436,6 +438,12 @@ export default {
         })
       }
     },
+    tableRowClassName1({ row }) {
+      console.log(row)
+      if (parseInt(row.报废数量) > parseInt(row.补投数量)) {
+        return 'baofei'
+      }
+    },
     handleSizeChange1(val) {
       this.currentPage1 = 1
       this.pageSize1 = val
@@ -511,7 +519,7 @@ export default {
             this.$message.error('补投失败')
           }
         })
-      } else { this.$message.warning('请选择停产零件') }
+      } else { this.$message.warning('请选择报废零件') }
     },
     editB() {
       if (this.spareNumber - this.SupplementationNumber > 0) {
@@ -528,7 +536,7 @@ export default {
         } else {
           this.$message.warning('补投数量不能为零')
         }
-      } else { alert('请选择停产零件') }
+      } else { alert('请选择报废零件') }
     },
     goToCapacityBalance() {
       this.$router.push({ path: '/ProductionCapacityBalance/index' })
@@ -557,3 +565,8 @@ export default {
     width:200px;
   }
 </style>
+<style>
+  .el-table .baofei{
+    background: #FF9797;
+  }
+</style>

src/views/TechnologyCenter/QueryParts/index.vue

@@ -26,7 +26,6 @@
           :value="item.value"/>
       </el-select>
       <el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrentWB = 1;pageSizeWB = 1000;pageCurrent = 1;pageSize = 1000;getTableData()">查询</el-button>
-      <el-button icon="el-icon-circle-plus-outline" type="distribution" size="small" @click="openUrgentItem()">加急件</el-button>
     </el-card>
     <el-card>
       <div v-for="(file, key) in hadFile" :key="key">
@@ -49,6 +48,7 @@
       <el-table
         v-loading="loading"
         :data="tableData"
+        :row-class-name="tableRowClassName1"
         highlight-current-row
         border
         stripe
@@ -264,49 +264,11 @@
           @current-change="handleCurrentChangeWB"/>
       </div>
     </el-card>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="添加加急件" center style="min-height: 300px" width="500px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="100px" class="demo-ruleForm">
-        <el-form-item label="机床号" prop="机床号" style="margin-left: 70px">
-          <el-select v-model="form.机床号" placeholder="选择机床" filterable clearable size="small" style="width:200px" @change="getGroupSelect1">
-            <el-option
-              v-for="item in machine"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="组号" prop="组号" style="margin-left: 70px">
-          <el-select v-model="form.组号" placeholder="选择组号" filterable clearable size="small" style="width:200px">
-            <el-option
-              v-for="item in group1"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="零件图号" prop="零件图号" style="margin-left: 70px">
-          <el-input v-model="form.零件图号" placeholder="零件图号" size="small" style="width:200px" clearable/>
-        </el-form-item>
-        <el-form-item label="零件名称" prop="零件名称" style="margin-left: 70px">
-          <el-input v-model="form.零件名称" placeholder="零件名称" size="small" style="width:200px" clearable/>
-        </el-form-item>
-        <el-form-item label="零件数量" prop="零件数量" style="margin-left: 70px">
-          <el-input-number v-model="form.零件数量" :step="1" :min="0" size="mini" style="width:200px"/>
-        </el-form-item>
-        <el-form-item label="零件备注" prop="零件备注" style="margin-left: 70px">
-          <el-input v-model="form.零件备注" placeholder="零件备注" size="small" style="width:200px" clearable/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form')">取消</el-button>
-        <el-button type="primary" @click="submit('form')">确定</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData, addUrgentItem } from '@/api/TechnologyCenter/QueryParts'
+import { machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData } from '@/api/TechnologyCenter/QueryParts'
 import { mapGetters } from 'vuex'
 import { ServerIP } from '@/utils/request'
 export default {
@@ -329,21 +291,6 @@ export default {
       pageCurrentWB: 1,
       pageSizeWB: 1000,
       totalWB: 0,
-      form: {
-        机床号: '',
-        组号: '',
-        零件图号: '',
-        零件名称: '',
-        零件数量: '',
-        零件备注: ''
-      },
-      rules: {
-        机床号: [{ required: true, message: '请选择机床', trigger: 'change' }],
-        组号: [{ required: true, message: '请选择组号', trigger: 'change' }],
-        零件图号: [{ required: true, message: '请输入零件图号', trigger: 'blur' }],
-        零件名称: [{ required: true, message: '请输入零件名称', trigger: 'blur' }],
-        零件数量: [{ required: true, message: '请输入零件数量', trigger: 'blur' }]
-      },
       hadFile: []
     }
   },
@@ -418,25 +365,6 @@ export default {
       this.form.组号 = ''
       this.getSelect(groupSelect, ['组号', '组件流水号'], 'group1', this.form.机床号)
     },
-    callOff(formName) {
-      this.dialogFormVisible = false
-      this.$refs[formName].resetFields()
-    },
-    submit(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          addUrgentItem(this.form.组号, this.form.零件图号, this.form.零件名称, this.form.零件数量, this.form.零件备注, this.id).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('添加成功')
-              this.getTableData()
-              this.dialogFormVisible = false
-            } else {
-              this.$message.error('添加成功')
-            }
-          })
-        }
-      })
-    },
     getTableData() {
       this.getFileData(this.machineValue)
       console.log(this.hadFile, 88899)
@@ -484,6 +412,12 @@ export default {
       }
       this.dialogFormVisible = true
     },
+    tableRowClassName1({ row }) {
+      console.log(row, 11111)
+      if (row.是否加急件 === '1') {
+        return 'isUrgentItem1'
+      }
+    },
     handleDelete(row) {
       if (row.基本件流水号) {
         this.deleteRow(deleteBasicParts, row.基本件流水号, function() {
@@ -571,4 +505,8 @@ a{
    margin: 0px !important;
 }
 </style>
-
+<style>
+  .el-table .isUrgentItem1{
+    background: #ff7575
+  }
+</style>

src/views/WorkshopProcurement/OfflineProcurement/index.vue

@@ -150,7 +150,7 @@
       <!--</div>-->
     </el-card>
     <el-card style="width: 1137px">
-      <el-table v-loading="" :data="tableData3" highlight-current-row border style="width: 100%;max-height: 300px;margin-top: 10px" size="mini">
+      <el-table v-loading="" :data="tableData3" highlight-current-row border style="width: 100%;margin-top: 10px" height="300px" size="mini">
         <el-table-column label="采购状态" align="center" width="90">
           <template slot-scope="scope">
             <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span>
@@ -489,6 +489,7 @@ export default {
     },
     handleSelectionChange(val) {
       this.materielGroup = []
+      this.Number = []
       for (let i = 0; i < val.length; i++) {
         this.materielGroup.push(val[i].工艺计划流水号)
         this.Number.push(val[i].批次数量)