外购件工艺定额制定，查看打回记录

src/api/ManufacturingCenter/PartAssignment.js

@@ -211,3 +211,67 @@ export function Production(num, MaterialNum, projectFloatValue, machineFloatValu
     }
   })
 }
+export function PartCallbackInformation() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_退回记录_基本件_查询数据'
+    }
+  })
+}
+export function PartCallbackInformation1() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_退回记录_标准件和外购件_查询数据'
+    }
+  })
+}
+export function submit(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_退回记录_确认数据',
+      param: '基本件流水号=' + num
+    }
+  })
+}
+export function submit1(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_退回记录_确认数据',
+      param: '标准件和外购件流水号=' + num
+    }
+  })
+}
+export function Delete(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_退回记录_删除数据',
+      param: '基本件流水号=' + num
+    }
+  })
+}
+export function Delete1(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_退回记录_删除数据',
+      param: '标准件和外购件流水号=' + num
+    }
+  })
+}

src/api/ManufacturingCenter/ProcessPlanning.js

@@ -8,7 +8,7 @@ export function initCraftmen() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=9'
+      param: '考核部门编号=17'
     }
   })
 }
@@ -209,8 +209,8 @@ export function gongyiCopy(num1, num2) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_零件工序_工艺拷贝_工艺计划流水号',
-      param: '工艺计划流水号_完成工艺=' + num1 + '=int&工艺计划流水号_被拷工艺=' + num2 + '=int'
+      name: '车间采购管理工艺_零件工序_工艺拷贝_工艺流水号',
+      param: '工艺流水号_完成工艺=' + num1 + '=int&工艺流水号_被拷工艺=' + num2 + '=int'
     }
   })
 }
@@ -233,8 +233,8 @@ export function hardEdit(num, hard) {
     method: 'post',
     data: {
       type: '2',
-      name: '车间生产管理工艺_零件工序_修改数据_工艺难度等级',
-      param: '工序流水号=' + num + '=int&工艺难度等级=' + hard
+      name: '车间采购管理工艺_零件工序_修改数据_工艺难度等级',
+      param: '外购件工序流水号=' + num + '=int&工艺难度等级=' + hard
     }
   })
 }
@@ -329,8 +329,8 @@ export function selectRequest(num0, num1, num2, num3, request0) {
     method: 'post',
     data: {
       type: '2',
-      name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号',
-      param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
+      name: '车间采购管理工艺_零件工序_修改数据_根据外购件工序流水号和工艺流水号',
+      param: '外购件工序流水号=' + num0 + '&工艺流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
     }
   })
 }

src/api/WorkshopProcurement/OutsourcingProcessPlanning.js

@@ -0,0 +1,277 @@
+import request from '@/utils/request'
+
+// 初始化 工艺员A
+export function initCraftmen() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=17'
+    }
+  })
+}
+// 查询 项目
+export function getProject(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件工艺计划_项目查询',
+      param: '是否制定计划=' + num
+    }
+  })
+}
+// 查询 机床
+export function getMachine(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件工艺计划_机床查询',
+      param: '项目流水号=' + num1 + '&是否制定计划=' + num
+    }
+  })
+}
+// 查询 组号
+export function getGroup(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件工艺计划_组号查询',
+      param: '机床流水号=' + num1 + '&是否制定计划=' + num
+    }
+  })
+}
+// 查询 零件号
+export function getPartnames1(num, num1, num2, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件工艺计划_零件查询',
+      param: '组件流水号=' + num1 + '&是否制定计划=' + num + '&组件类别=' + num2,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询 零件工序
+export function getProcedure(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件工序_查询工序信息',
+      param: '工艺流水号=' + num
+    }
+  })
+}
+// 初始化工艺名称
+export function processNameClick() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_工艺分类名称_查询数据'
+    }
+  })
+}
+// 工艺名称查询
+export function processNameSelect(val) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_工艺名称_查询数据',
+      param: '工艺分类流水号_check=1=bit&工艺分类流水号=' + val + '=int'
+    }
+  })
+}
+// 工艺要求查询
+export function processRequestSelect(val) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理_基础表_工艺要求_查询数据',
+      param: '工艺编号=' + val + '=int'
+    }
+  })
+}
+// 初始化公差A
+export function initTolerance() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_公差对照表_查询数据'
+    }
+  })
+}
+// 公差查询
+export function searchTolerance(val1, val2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_公差对照表_公差_查询数据',
+      param: '输入数值=' + val1 + '&参数=' + val2
+    }
+  })
+}
+// 工艺定额人员查询
+export function initPerson() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=17'
+    }
+  })
+}
+// 完艺工艺拷贝
+export function gongyiCopy(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件工序_工艺拷贝_工艺流水号',
+      param: '工艺流水号_完成工艺=' + num1 + '=int&工艺流水号_被拷工艺=' + num2 + '=int'
+    }
+  })
+}
+// 主界面主表难度等级修改
+export function hardEdit(num, hard) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_修改数据_工艺难度等级',
+      param: '外购件工序流水号=' + num + '=int&工艺难度等级=' + hard
+    }
+  })
+}
+// 主界面主表工艺要求修改
+export function requestEdit(num, request0) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_修改数据_工艺要求_根据外购件工序流水号',
+      param: '外购件工序流水号=' + num + '=int&工艺要求=' + request0
+    }
+  })
+}
+// 主界面主表插入功能
+export function insertOne(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_修改数据_工艺流水号和外购件工序流水号',
+      param: '工艺流水号=' + num0 + '&外购件工序流水号=' + num1
+    }
+  })
+}
+// 主界面主表删除功能
+export function deleteOne(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_删除数据_外购件工序流水号',
+      param: '工艺流水号=' + num0 + '&外购件工序流水号=' + num1
+    }
+  })
+}
+// 主界面主表上移功能
+export function upOne(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_修改数据_上移工序',
+      param: '工艺流水号=' + num0 + '&外购件工序流水号=' + num1
+    }
+  })
+}
+// 主界面主表下移功能
+export function downOne(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_修改数据_下移工序',
+      param: '工艺流水号=' + num0 + '&外购件工序流水号=' + num1
+    }
+  })
+}
+// 核准保存
+export function saveApprove(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_增加数据_同时修改工艺计划',
+      param: '工艺流水号=' + num0 + '&工艺人员编号=' + num1
+    }
+  })
+}
+// 选择工艺要求
+export function selectRequest(num0, num1, num2, num3, request0) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_修改数据_根据外购件工序流水号和工艺流水号',
+      param: '外购件工序流水号=' + num0 + '&工艺流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
+    }
+  })
+}
+// 删除
+export function deleteTable(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_删除零件工艺',
+      param: '工艺流水号=' + num
+    }
+  })
+}
+// 零件工艺修改
+export function returnEdit(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_工艺调整_修改工艺',
+      param: '工艺流水号=' + num
+    }
+  })
+}

src/api/WorkshopProcurement/OutsourcingQuotaSetting.js

@@ -0,0 +1,111 @@
+import request from '@/utils/request'
+
+// 人员111
+export function getPerson() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=17'
+    }
+  })
+}
+// 查询 项目
+export function getProject(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件定额计划_项目查询',
+      param: '是否制定定额=' + num
+    }
+  })
+}
+// 查询 机床
+export function getMachine(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件定额计划_机床查询',
+      param: '项目流水号=' + num1 + '&是否制定定额=' + num
+    }
+  })
+}
+// 查询 组号
+export function getGroup(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件定额计划_组号查询',
+      param: '机床流水号=' + num1 + '&是否制定定额=' + num
+    }
+  })
+}
+// 查询 零件号
+export function getPartnames1(num, num1, num2, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件定额计划_零件查询',
+      param: '组件流水号=' + num1 + '&是否制定定额=' + num + '&组件类别=' + num2,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询 零件工序
+export function getProcedure(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件工序_查询工序信息',
+      param: '工艺流水号=' + num
+    }
+  })
+}
+// 定额状态修改
+export function returnEdit(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_工艺调整_修改定额',
+      param: '工艺流水号=' + num
+    }
+  })
+}
+// 零件定额修改
+export function update(num, num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件定额计划_修改定额',
+      param: '外购件工序流水号=' + num + '&单件定额工时=' + num1 + '&准结定额工时=' + num2
+    }
+  })
+}
+// 保存
+export function saveApprove(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_修改定额计划',
+      param: '工艺流水号=' + num0 + '&定额人员编号=' + num1
+    }
+  })
+}

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -27,6 +27,12 @@
             :value="item.value"/>
         </el-select>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>
+        <el-badge :value="value1" :max="99" class="item">
+          <el-button size="small" type="text" @click="PartCallbackInformation1">外购件和标准件打回信息</el-button>
+        </el-badge>
+        <el-badge :value="value" :max="99" class="item">
+          <el-button size="small" type="text" @click="PartCallbackInformation">基本件打回信息</el-button>
+        </el-badge>
       </el-row>
     </el-card>
     <el-card>
@@ -386,11 +392,147 @@
         <el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      :visible.sync="dialogFormVisible1"
+      :row-style="tableRowClassName"
+      title="基本件打回信息"
+      center
+      width="70%"
+      style="min-height: 400px">
+      <el-table
+        :data="tableData9"
+        size="mini"
+        style="width: 97%;max-height: 300px"
+        height="400"
+        highlight-current-row
+        border>
+        <el-table-column align="center" label="零件图号">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="零件名称">
+          <template slot-scope="scope">
+            {{ scope.row.零件名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="材料">
+          <template slot-scope="scope">
+            {{ scope.row.材料 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="零件数量" width="70">
+          <template slot-scope="scope">
+            {{ scope.row.零件数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="项目名称">
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="机床编号">
+          <template slot-scope="scope">
+            {{ scope.row.机床编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="组号">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="退回时间">
+          <template slot-scope="scope">
+            {{ scope.row.退回时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column property="date" label="操作" width="200" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="success"
+              @click="submit(scope.row)">确认</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              @click="Delete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+    <el-dialog
+      :visible.sync="dialogFormVisible2"
+      :row-style="tableRowClassName"
+      title="外购件和标准件打回信息"
+      center
+      width="70%"
+      style="min-height: 400px">
+      <el-table
+        :data="tableData10"
+        size="mini"
+        style="width: 97%;max-height: 300px"
+        height="400"
+        highlight-current-row
+        border>
+        <el-table-column align="center" label="物料名称">
+          <template slot-scope="scope">
+            {{ scope.row.物料名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="物料规格">
+          <template slot-scope="scope">
+            {{ scope.row.物料规格 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="物料型号">
+          <template slot-scope="scope">
+            {{ scope.row.物料型号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="零件数量" width="70">
+          <template slot-scope="scope">
+            {{ scope.row.零件数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="项目名称">
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="机床编号">
+          <template slot-scope="scope">
+            {{ scope.row.机床编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="组号">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="退回时间">
+          <template slot-scope="scope">
+            {{ scope.row.退回时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column property="date" label="操作" width="200" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="success"
+              @click="submit1(scope.row)">确认</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              @click="Delete1(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { initProject, searchmachine, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production } from '@/api/ManufacturingCenter/PartAssignment'
+import { initProject, searchmachine, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1 } from '@/api/ManufacturingCenter/PartAssignment'
 import { mapGetters } from 'vuex'
 export default {
   inject: ['reload'],
@@ -446,7 +588,13 @@ export default {
       pageSize: '',
       pageCurrent: '',
       total: '',
-      check: ''
+      check: '',
+      value: 0,
+      value1: 0,
+      tableData9: [],
+      tableData10: [],
+      dialogFormVisible1: false,
+      dialogFormVisible2: false
     }
   },
   computed: {
@@ -463,6 +611,125 @@ export default {
   methods: {
     fetchData() {
       this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
+      PartCallbackInformation().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          if (response.data[i].退回时间 !== '') {
+            response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+          }
+          if (response.data[i].是否确认 === '0') {
+            this.value += 1
+          }
+        }
+        this.tableData9 = response.data
+      })
+      PartCallbackInformation1().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          if (response.data[i].退回时间 !== '') {
+            response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+          }
+          if (response.data[i].是否确认 === '0') {
+            this.value1 += 1
+          }
+        }
+        this.tableData10 = response.data
+      })
+    },
+    PartCallbackInformation() {
+      this.dialogFormVisible1 = true
+    },
+    PartCallbackInformation1() {
+      this.dialogFormVisible2 = true
+    },
+    submit(row) {
+      submit(row.基本件流水号).then(response => {
+        this.value = 0
+        if (response.data[0].result === '1') {
+          this.$message.success('确认成功')
+          PartCallbackInformation().then(response => {
+            for (let i = 0; i < response.data.length; i++) {
+              if (response.data[i].退回时间 !== '') {
+                response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+              }
+              if (response.data[i].是否确认 === '0') {
+                this.value += 1
+              }
+            }
+            this.tableData9 = response.data
+          })
+        } else {
+          this.$message.error('确认失败')
+        }
+      })
+    },
+    submit1(row) {
+      submit1(row.标准件和外购件流水号).then(response => {
+        this.value1 = 0
+        if (response.data[0].result === '1') {
+          this.$message.success('确认成功')
+          PartCallbackInformation1().then(response => {
+            for (let i = 0; i < response.data.length; i++) {
+              if (response.data[i].退回时间 !== '') {
+                response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+              }
+              if (response.data[i].是否确认 === '0') {
+                this.value1 += 1
+              }
+            }
+            this.tableData10 = response.data
+          })
+        } else {
+          this.$message.error('确认失败')
+        }
+      })
+    },
+    Delete(row) {
+      Delete(row.基本件流水号).then(response => {
+        this.value = 0
+        if (response.data[0].result === '1') {
+          this.$message.success('删除成功')
+          PartCallbackInformation().then(response => {
+            for (let i = 0; i < response.data.length; i++) {
+              if (response.data[i].退回时间 !== '') {
+                response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+              }
+              if (response.data[i].是否确认 === '0') {
+                this.value += 1
+              }
+            }
+            this.tableData9 = response.data
+          })
+        } else {
+          this.$message.error('删除失败')
+        }
+      })
+    },
+    Delete1(row) {
+      Delete1(row.标准件和外购件流水号).then(response => {
+        this.value1 = 0
+        if (response.data[0].result === '1') {
+          this.$message.success('删除成功')
+          PartCallbackInformation1().then(response => {
+            for (let i = 0; i < response.data.length; i++) {
+              if (response.data[i].退回时间 !== '') {
+                response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+              }
+              if (response.data[i].是否确认 === '0') {
+                this.value1 += 1
+              }
+            }
+            this.tableData10 = response.data
+          })
+        } else {
+          this.$message.error('删除失败')
+        }
+      })
+    },
+    tableRowClassName({ row }) {
+      if (row.是否确认 === '0') {
+        return 'background: #ffff66'
+      } else {
+        return ''
+      }
     },
     projectChange() {
       this.machineNumberValue = ''
@@ -805,14 +1072,6 @@ export default {
                 searchPart(this.groupFloatValue).then(response => {
                   this.tableData1 = response.data
                 })
-                searchDetailed1(this.RequisitionList).then(response => {
-                  for (let i = 0; i < response.data.length; i++) {
-                    if (response.data[i].物料计划到货时间 !== '') {
-                      response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
-                    }
-                  }
-                  this.tableData6 = response.data
-                })
               } else {
                 this.$message.error('请购失败')
               }
@@ -871,8 +1130,13 @@ export default {
               searchPart(this.groupFloatValue).then(response => {
                 this.tableData1 = response.data
               })
-              searchDetailed(this.RequisitionList).then(response => {
-                this.tableData5 = response.data
+              searchDetailed1(this.RequisitionList).then(response => {
+                for (let i = 0; i < response.data.length; i++) {
+                  if (response.data[i].物料计划到货时间 !== '') {
+                    response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                  }
+                }
+                this.tableData6 = response.data
               })
             } else { this.$message.error('移出失败') }
           })
@@ -884,6 +1148,11 @@ export default {
                 this.tableData2 = response.data
               })
               searchDetailed(this.RequisitionList).then(response => {
+                for (let i = 0; i < response.data.length; i++) {
+                  if (response.data[i].物料计划到货时间 !== '') {
+                    response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                  }
+                }
                 this.tableData5 = response.data
               })
             } else { this.$message.error('移出失败') }
@@ -896,14 +1165,16 @@ export default {
                 this.tableData3 = response.data
               })
               searchDetailed(this.RequisitionList).then(response => {
+                for (let i = 0; i < response.data.length; i++) {
+                  if (response.data[i].物料计划到货时间 !== '') {
+                    response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                  }
+                }
                 this.tableData5 = response.data
               })
             } else { this.$message.error('移出失败') }
           })
         }
-        searchDetailed(this.RequisitionList).then(response => {
-          this.tableData5 = response.data
-        })
       }).catch(() => {
         this.$message({
           type: 'info',
@@ -921,4 +1192,9 @@ export default {
   span{
     margin: 10px 0px 10px 10px;
   }
+  .item {
+    float: right;
+    margin-top: 10px;
+    margin-right: 40px;
+  }
 </style>

src/views/WorkshopProcurement/OfflineContract1/index.vue

@@ -358,6 +358,11 @@ export default {
     searchTable2() { // 查询请购单列表
       this.PurchaseOrder ? this.check3 = 1 : this.check3 = 0
       searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.PurchaseOrder).then(response => {
+        for (let i = 0; i < response.data.rows.length; i++) {
+          if (response.data.rows[i].请购时间 !== '') {
+            response.data.rows[i].请购时间 = (response.data.rows[i].请购时间).split(' ')[0]
+          }
+        }
         this.tableData2 = response.data.rows
         this.total2 = response.data.total
       })

src/views/WorkshopProcurement/OutsourcingQuotaSetting/index.vue

@@ -0,0 +1,506 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <div style="margin-top: -10px;">
+        <el-radio-group v-model="radio" style="margin: 10px;" @change="clearDetail">
+          <el-radio :label="0">未编制</el-radio>
+          <el-radio :label="1">已编制</el-radio>
+        </el-radio-group>
+        <span style="margin: 10px">定额员:</span>
+        <el-select v-model="personValue" size="small" style="width: 100px" placeholder="定额员">
+          <el-option
+            v-for="item in person"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>项目名称:</span>
+        <el-select
+          v-model="projectNameValue"
+          placeholder="项目名称"
+          size="small"
+          style="width:100px"
+          clearable
+          @change="searchMachine()">
+          <el-option
+            v-for="item in projectName"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>机床编号:</span>
+        <el-select
+          v-model="machineValue"
+          placeholder="机床编号"
+          size="small"
+          style="width:100px"
+          clearable
+          @change="searchGroup()">
+          <el-option
+            v-for="item in Machine"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>组号:</span>
+        <el-select
+          v-model="groupNumberValue"
+          placeholder="组号"
+          size="small"
+          style="width:100px"
+          clearable
+          @change="changeGroup()">
+          <el-option
+            v-for="item in groupNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>图号/名称:</span>
+        <el-input
+          v-model="partNum"
+          clearable
+          style="width:120px"
+          placeholder="请双击选择"
+          size="small"
+          @change="clear()"
+          @dblclick.native="searchParts"/>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin: 10px" @click="searchDetail()">查询</el-button>
+        <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">工艺调整
+        </el-button>
+      </div>
+
+      <div>
+        <span>种类:</span>
+        <el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px"/>
+        <span>名称/型号:</span>
+        <el-input v-model="partName" placeholder="名称" size="small" readonly style="width:115px"/>
+        <span>材质:</span>
+        <el-input v-model="materialName" placeholder="材质" size="small" style="width:120px" readonly/>
+        <span>规格:</span>
+        <el-input v-model="spec" style="width:100px" size="small" placeholder="规格" readonly/>
+        <span>投产总数量:</span>
+        <el-input v-model="batchNum" placeholder="总数量" readonly size="small" style="width:80px;margin-top:10px;"/>
+      </div>
+    </el-card>
+    <el-card>
+      <div>
+        <el-table v-loading="listLoading" :data="tableData" border style="width: 100%;" height="550px">
+          <el-table-column type="index" label="序号" width="50" align="center"/>
+          <el-table-column prop="name" label="工艺名称" width="180" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.工艺名称" style="width:150px" placeholder="工艺名称" readonly/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="request" label="工艺要求" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.工艺要求" :rows="1" placeholder="工艺要求" type="textarea" readonly/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="singleton" label="单件" width="180" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.单件定额工时" :disabled="disabled" style="width:150px" placeholder="单件" @change="update(scope.row)"/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="Settlement" label="准结" width="180" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.准结定额工时" :disabled="disabled" style="width:150px" placeholder="准结" @change="update(scope.row)"/>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-button v-if="radio === 0" type="primary" icon="el-icon-cjn-09" size="small" style="float:right;margin: 10px" @click="saveApprove">保存</el-button>
+
+      </div>
+    </el-card>
+    <el-dialog
+      :visible.sync="dialogFormVisible4"
+      title="图号"
+      center
+      style="min-height: 300px">
+      <el-table
+        :data="tableData8"
+        size="mini"
+        style="width: 97%;max-height: 300px"
+        height="300"
+        highlight-current-row
+        border
+        @row-click="selectParts">
+        <el-table-column align="center" label="物料名称">
+          <template slot-scope="scope">
+            {{ scope.row.物料名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="物料规格">
+          <template slot-scope="scope">
+            {{ scope.row.物料规格 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="物料型号">
+          <template slot-scope="scope">
+            {{ scope.row.物料型号 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="1"
+          :page-sizes="[10, 20]"
+          :page-size="10"
+          :pager-count="5"
+          :total="total"
+          small
+          layout="sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submit()">确认</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="dialogFormVisible5"
+      title="图号"
+      center
+      style="min-height: 300px">
+      <el-table
+        :data="tableData9"
+        size="mini"
+        style="width: 97%;max-height: 300px"
+        height="300"
+        highlight-current-row
+        border
+        @row-click="selectParts1">
+        <el-table-column align="center" label="零件图号">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="零件名称">
+          <template slot-scope="scope">
+            {{ scope.row.物料名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="材料">
+          <template slot-scope="scope">
+            {{ scope.row.材料 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="1"
+          :page-sizes="[10, 20]"
+          :page-size="10"
+          :pager-count="5"
+          :total="total"
+          small
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submit()">确认</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { getPerson, getPartnames1, getProject, getMachine, getGroup, update, getProcedure, returnEdit, saveApprove } from '@/api/WorkshopProcurement/OutsourcingQuotaSetting'
+
+export default {
+  data() {
+    return {
+      projectNameValue: '',
+      projectName: [],
+      machineValue: '',
+      Machine: [],
+      groupNumberValue: '',
+      groupNumber: [],
+      groupNum: '',
+      groupType: '',
+      tableData8: [],
+      tableData9: [],
+      ProcessFlowNumber: '',
+      spec: '', // 规格
+      total: 0,
+      pageCurrent: 1,
+      pageSize: 10,
+      isShow2: false,
+      dialogFormVisible4: false,
+      dialogFormVisible5: false,
+      listLoading: false,
+      personValue: '',
+      person: [],
+      radio: 0, // 第一组
+      partNum: '', // 零件号
+      typeValue: '', // 种类
+      partName: '', // 零件名称
+      batchNum: '', // 投产总数量
+      materialName: '', // 材质
+      tableData: [],
+      isShow: false // 2的可见性
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() { // 初始化未编制零件号
+      getPerson().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.person.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+      getProject(0).then(response => { // 初始化项目
+        for (let i = 0; i < response.data.length; i++) {
+          this.projectName.push({
+            label: response.data[i].项目名称,
+            value: response.data[i].项目流水号
+          })
+        }
+      })
+    },
+    clear() {
+      this.typeValue = ''
+      this.partName = ''
+      this.partNum = ''
+      this.materialName = ''
+      this.spec = ''
+      this.batchNum = ''
+    },
+    clearDetail() {
+      if (this.radio === 1) {
+        this.isShow2 = true
+      } else {
+        this.isShow2 = false
+      }
+      this.checked = false
+      this.projectNameValue = ''
+      this.projectName = []
+      getProject(this.radio).then(response => { // 初始化项目
+        for (let i = 0; i < response.data.length; i++) {
+          this.projectName.push({
+            label: response.data[i].项目名称,
+            value: response.data[i].项目流水号
+          })
+        }
+      })
+      this.machineValue = ''
+      this.Machine = []
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      this.partNum = ''
+      this.typeValue = ''
+      this.partName = ''
+      this.materialName = ''
+      this.spec = ''
+      this.batchNum = ''
+      this.tableData = []
+    },
+    searchDetail() { // 查主表的信息
+      if (this.partNum === '' || this.partNum === null) {
+        this.$message.error('请选择零件作为查询对象')
+      } else {
+        getProcedure(this.ProcessFlowNumber).then(response => {
+          this.tableData = []
+          for (let i = 0; i < response.data.length; i++) {
+            if (response.data[i].工艺编号 === null) {
+              response.data[i].工艺编号 = 0
+            }
+            if (response.data[i].工艺要求 === null) {
+              response.data[i].工艺要求 = ''
+            }
+          }
+          this.tableData = response.data
+        })
+      }
+    },
+    returnEdit() { // 定额修改
+      if (this.partNum === '' || this.partNum === null) {
+        this.$message.error('请选择零件')
+      } else {
+        this.$confirm('此操作会将该零件打回至未编制状态, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          returnEdit(this.ProcessFlowNumber).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('打回成功')
+              this.ProcessFlowNumber = ''
+              this.partNum = ''
+              this.tableData = []
+            } else {
+              this.$message.error('打回失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
+          })
+        })
+      }
+    },
+    searchMachine() {
+      this.clear()
+      this.machineValue = ''
+      this.Machine = []
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      getMachine(this.radio, this.projectNameValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
+    },
+    searchGroup() {
+      this.clear()
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      getGroup(this.radio, this.machineValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+    },
+    changeGroup() {
+      this.clear()
+      for (let i = 0; i < this.groupNumber.length; i++) {
+        if (this.groupNumber[i].value === this.groupNumberValue) {
+          this.groupNum = this.groupNumber[i].label
+        }
+      }
+      if (this.groupNum.indexOf('MX') !== -1) {
+        this.groupType = 0
+      } else {
+        this.groupType = 1
+      }
+    },
+    selectParts(row) {
+      this.ProcessFlowNumber = row.工艺流水号
+      if (row.零件类型 === '1') {
+        this.typeValue = '标准件'
+      } else if (row.零件类型 === '2') {
+        this.typeValue = '外购件'
+      }
+      this.partName = row.物料型号
+      this.spec = row.物料规格
+      this.batchNum = row.批次数量
+      this.partNum = row.物料名称
+    },
+    selectParts1(row) {
+      this.ProcessFlowNumber = row.工艺流水号
+      if (row.零件类型 === '3') {
+        this.typeValue = '基本件'
+      }
+      this.partName = row.物料名称
+      this.materialName = row.材料
+      this.batchNum = row.批次数量
+      this.partNum = row.零件图号
+    },
+    searchParts() { // 根据条件查零件号
+      if (this.groupNumberValue !== '') {
+        if (this.radio === 0) { // 未编制
+          this.disabled = false
+          this.isShow2 = false
+        } else { // 已编制
+          this.isShow = true
+          this.isShow2 = true
+          this.disabled = true
+        }
+        this.pageCurrent = 1
+        this.pageSize = 10
+        getPartnames1(this.radio, this.groupNumberValue, this.groupType, this.pageCurrent, this.pageSize).then(response => {
+          if (this.groupType === 0) {
+            this.dialogFormVisible5 = true
+            this.tableData9 = response.data.rows
+            console.log(response.data)
+            this.total = response.data.total
+          } else {
+            this.dialogFormVisible4 = true
+            this.tableData8 = response.data.rows
+            this.total = response.data.total
+          }
+        })
+      } else {
+        this.$message.warning('请先选择组号')
+      }
+    },
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.pageCurrent = 1
+      getPartnames1(this.radio, this.groupNumberValue, this.groupType, this.pageCurrent, this.pageSize).then(response => {
+        if (this.groupType === 0) {
+          this.dialogFormVisible5 = true
+          this.tableData9 = response.data.rows
+          this.total = response.data.total
+        } else {
+          this.dialogFormVisible4 = true
+          this.tableData8 = response.data.rows
+          this.total = response.data.total
+        }
+      })
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      getPartnames1(this.radio, this.groupNumberValue, this.groupType, this.pageCurrent, this.pageSize).then(response => {
+        if (this.groupType === 0) {
+          this.dialogFormVisible5 = true
+          this.tableData9 = response.data.rows
+          this.total = response.data.total
+        } else {
+          this.dialogFormVisible4 = true
+          this.tableData8 = response.data.rows
+          this.total = response.data.total
+        }
+      })
+    },
+    update(row) {
+      update(row.外购件工序流水号, row.单件定额工时, row.准结定额工时).then(response => {
+      })
+    },
+    submit() {
+      this.dialogFormVisible4 = false
+      this.dialogFormVisible5 = false
+    },
+    saveApprove() { // 保存
+      saveApprove(this.ProcessFlowNumber, this.personValue).then(response => {
+        if (response.data.length === 1) {
+          this.partNum = ''
+          this.typeValue = ''
+          this.partName = ''
+          this.batchNum = ''
+          this.materialName = ''
+          this.spec = ''
+          this.tableData = []
+          this.$message.success('保存成功')
+        } else {
+          this.$message.error('保存失败')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .doing-row4{
+    background: #f0f9eb;
+  }
+  .el-card{
+    margin-bottom: 15px;
+  }
+</style>