任务处理中心

src/views/modules/production/scheduling.vue

@@ -1,20 +1,8 @@
-<!-- 排产管理 -->
+<!-- 任务处理中心 -->
 <template>
   <div class="production">
     <template v-if="!detailsVisible && !outsourceVisible">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryPage()">
-        <el-form-item label="合同号">
-          <el-input v-model="dataForm.orderCode" placeholder="合同号" clearable/>
-        </el-form-item>
-        <el-form-item label="客户名称">
-          <el-input v-model="dataForm.customerName" placeholder="客户名称" clearable/>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="queryPage()">查询</el-button>
-          <el-button v-if="isAuth('prod:production:planList')" type="primary" @click="batchPlan()">批量排产</el-button>
-<!--          <el-button v-if="isAuth('pur:commDetail:save')" type="primary" @click="outsourceHandle2()">批量委外</el-button>-->
-        </el-form-item>
-      </el-form>
+      <el-header style="font-size: large;text-align: center">任务处理中心</el-header>
       <el-table
         :data="dataList"
         border
@@ -35,9 +23,9 @@
           prop="orderCode"
           header-align="center"
           align="center"
-          min-width="140"
+          min-width="120"
           :show-tooltip-when-overflow="true"
-          label="合同号">
+          label="任务单编码">
         </el-table-column>
         <el-table-column
           prop="customerName"
@@ -48,12 +36,20 @@
           label="客户名称">
         </el-table-column>
         <el-table-column
-          prop="prodCode"
+          prop="contractNumber"
+          header-align="center"
+          align="center"
+          min-width="140"
+          :show-tooltip-when-overflow="true"
+          label="合同编号">
+        </el-table-column>
+        <el-table-column
+          prop="productNumber"
           header-align="center"
           align="center"
           min-width="120"
           :show-tooltip-when-overflow="true"
-          label="产品编号">
+          label="生产编号">
         </el-table-column>
         <el-table-column
           prop="productName"
@@ -61,46 +57,87 @@
           align="center"
           min-width="160"
           :show-tooltip-when-overflow="true"
-          label="产品名称">
+          label="物料名称">
         </el-table-column>
         <el-table-column
-          prop="isCompose"
+          prop="cnt"
           header-align="center"
           align="center"
-          :formatter="formatBoolean"
-          label="是否组合产品">
+          min-width="100"
+          label="数量">
         </el-table-column>
         <el-table-column
-          prop="state"
+          prop="isAppraise"
           header-align="center"
           align="center"
-          :formatter="formatState"
-          label="当前状态">
+          :formatter="formatAppraise"
+          label="是否鉴定">
+        </el-table-column>
+        <el-table-column
+          prop="isFirst"
+          header-align="center"
+          align="center"
+          :formatter="formatFirst"
+          label="是否首件">
+        </el-table-column>
+        <el-table-column
+          prop="deliveryDate"
+          header-align="center"
+          align="center"
+          min-width="160"
+          label="交期时间">
         </el-table-column>
         <el-table-column
-          prop="outsourcing"
+          prop="batchNumber"
           header-align="center"
           align="center"
-          :formatter="formatOutsourcingState"
-          label="委外状态">
+          min-width="140"
+          :show-tooltip-when-overflow="true"
+          label="批次号">
         </el-table-column>
         <el-table-column
           prop="notes"
           header-align="center"
           align="center"
-          min-width="180"
-          :show-overflow-tooltip="true"
+          width="180"
+          :show-tooltip-when-overflow="true"
           label="备注">
         </el-table-column>
+        <el-table-column
+          prop="inventoryCnt"
+          header-align="center"
+          align="center"
+          min-width="140"
+          label="仓库核对数量">
+        </el-table-column>
+        <el-table-column
+          prop="prodState"
+          header-align="center"
+          align="center"
+          width="120"
+          :formatter="formatState"
+          label="当前状态">
+        </el-table-column>
+        <el-table-column
+          prop="state"
+          header-align="center"
+          align="center"
+          :formatter="formatState2"
+          label="处理状态">
+        </el-table-column>
         <el-table-column
           fixed="right"
           header-align="center"
           align="center"
-          width="150"
+          width="280"
           label="操作">
           <template slot-scope="scope">
+            <el-button type="text" size="small" @click="check(scope.row.id)">核料</el-button>
+            <el-button type="text" size="small" @click="check(scope.row.id)">转采购</el-button>
+            <el-button type="text" size="small" @click="check(scope.row.id)">转委外</el-button>
+            <el-button type="text" size="small" @click="check(scope.row.id)">试制前检查</el-button>
             <el-button v-if="isAuth('prod:production:plan')" type="text" size="small" @click="detail(scope.row.id, true)">排产</el-button>
-            <el-button v-if="isAuth('pur:commDetail:save') && Number(scope.row.outsourcing) === 0" type="text" size="small" @click="outsourceHandle(scope.row.id)">委外生产</el-button>
+<!--            <el-button v-if="isAuth('pur:commDetail:save') && Number(scope.row.outsourcing) === 0" type="text" size="small" @click="outsourceHandle(scope.row.id)">委外生产</el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -139,34 +176,54 @@
         totalPage: 0,
         dataListLoading: false,
         dataListSelections: [],
-        // 状态：1：待排产，2:生产中，3:生产完成
-        optionsState: [
+        // 状态
+        optionsProdState: [
+          {
+            code: '0',
+            value: '待试制前检查'
+          },
           {
             code: '1',
-            value: '待排产'
+            value: '等待'
           },
           {
             code: '2',
-            value: '生产中'
+            value: '待排产'
           },
           {
             code: '3',
+            value: '生产中生产完成'
+          },
+          {
+            code: '4',
             value: '生产完成'
-          }
-        ],
-        // 委外状态
-        outsourcingState: [
+          },
           {
-            code: '0',
-            value: '正常'
+            code: '5',
+            value: '检验不合格完成'
           },
+          {
+            code: '6',
+            value: '操作损坏完成'
+          }
+        ],
+        // 处理状态
+        optionsState: [
           {
             code: '1',
-            value: '成品委外'
+            value: '待核料'
           },
           {
             code: '2',
-            value: '工序委外'
+            value: '采购'
+          },
+          {
+            code: '3',
+            value: '委外'
+          },
+          {
+            code: '4',
+            value: '生产'
           }
         ],
         multipleSelection: []
@@ -250,22 +307,27 @@
         })
       },
       // 转换属性：是否
-      formatBoolean (row) {
-        if (!row.isCompose) return ''
-        return row.isCompose === '1' ? '是' : '否'
+      formatAppraise (row) {
+        if (!row.isAppraise) return ''
+        return row.isAppraise === '1' ? '否' : '是'
       },
-      // 转换属性“是否组合产品”
+      // 转换属性：是否
+      formatFirst (row) {
+        if (!row.isFirst) return ''
+        return row.isFirst === '1' ? '否' : '是'
+      },
+      // 转换属性“当前状态”
       formatState (row) {
-        if (!row.state) return ''
-        const item1 = this.optionsState.find((item) => item.code === row.state.toString())
+        if (!row.prodState) return ''
+        const item1 = this.optionsProdState.find((item) => item.code === row.prodState.toString())
         return item1 ? item1.value : ''
       },
-      // 转换属性“委外状态”
-      formatOutsourcingState (row) {
-        if (!row.outsourcing) {
+      // 转换属性“处理状态”
+      formatState2 (row) {
+        if (!row.state) {
           return ''
         }
-        const item1 = this.outsourcingState.find((item) => item.code === row.outsourcing.toString())
+        const item1 = this.optionsState.find((item) => item.code === row.state.toString())
         return item1 ? item1.value : ''
       },
       closeDialogEvent () {