From d1d929e9a552f29cfc8c06c75093b5cfb487a0fc Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 18 Mar 2019 09:17:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessPlanning/index.vue                 | 42 ++++++++++++++++---
 .../ProcessingStatus/index.vue                | 18 ++++----
 .../ProcessingStatusEdit/index.vue            |  2 +-
 3 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
index 4c6e958b..1005d7dd 100644
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
 
     <el-card>
-      <el-radio-group v-model="radio" size="small" style="margin: 10px;" @change="CraftmenValue = '';checked = false;partNumValue = '';typeValue = '';partName = '';material = '';materialName = '';spec = '';batchNum = '';searchParts()">
+      <el-radio-group v-model="radio" size="small" style="margin: 10px;" @change="CraftmenValue = '';checked = false;partNumValue = '';typeValue = '';partName = '';material = '';prepareMateriel = '';spec = '';batchNum = '';searchParts()">
         <el-radio v-model="radio" :label="1">未编制</el-radio>
         <el-radio v-model="radio" :label="2">已编制</el-radio>
       </el-radio-group>
@@ -31,15 +31,15 @@
         <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="batchNum" readonly size="small" style="width:80px;margin-top:10px;"/>
         <span>材质:</span>
-        <el-input v-model="materialName" placeholder="材质" size="small" style="width:215px" readonly>
-          <el-button slot="prepend" icon="el-icon-search" @click="dialogMaterial=true"/>
+        <el-input v-model="prepareMateriel" placeholder="物料" size="small" style="width:215px" readonly>
+          <el-button slot="prepend" icon="el-icon-search" @click="dialogMateria2=true"/>
           <el-button slot="append" icon="el-icon-cjn-09" @click="saveMaterial"/>
         </el-input>
         <span>规格:</span>
         <el-input v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
-        <span>投产总数量:</span>
-        <el-input v-model="batchNum" readonly size="small" style="width:80px;margin-top:10px;"/>
       </div>
       <div>
         <el-row>
@@ -101,6 +101,7 @@
             <el-input-number v-model="changdu2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
             <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation5()">计算重量</el-button>
           </el-col>
+
         </el-row>
       </div>
     </el-card>
@@ -206,7 +207,34 @@
       </el-table>
     </el-card>
 
-    <el-dialog :visible.sync="dialogMaterial" title="材质选择" center width="400px">
+    <el-dialog :visible.sync="dialogMaterial" title="物料选择" center width="400px">
+      <el-input v-model="input" placeholder="材质" size="small" style="width:200px"/>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>
+      <el-table :data="tableMaterial" size="mini" highlight-current-row border @row-click="selectMaterial">
+        <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" size="small" @click="selectMaterial2()">提交</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogMateria2" title="物料选择" center width="400px">
       <el-input v-model="input" placeholder="材质" size="small" style="width:200px"/>
       <el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>
       <el-table :data="tableMaterial" size="mini" highlight-current-row border @row-click="selectMaterial">
@@ -499,6 +527,8 @@ export default {
   },
   data() {
     return {
+      dialogMateria2: false,
+      prepareMateriel: '',
       lastFocusText: '',
       Result1: '',
       Result2: '',
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index e1c418f4..775e66b9 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -23,6 +23,14 @@
         </el-select>
         <span>零件图号:</span>
         <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 180px;"/>
+        <span>进度颜色：</span>
+        <span style="background-color: red">拖期</span>
+        <span style="background-color: yellow">即将拖期</span>
+        <span style="background-color: lawngreen">如期</span>
+        <span style="background-color: deepskyblue">工序外协</span>
+        <span style="background-color: grey">报废</span>
+      </el-row>
+      <el-row style="margin-top:10px;">
         <span class="demonstration">计划下达时间:</span>
         <el-date-picker
           v-model="startTime"
@@ -31,7 +39,7 @@
           style="width: 160px"
           type="date"
           placeholder="选择日期"/>
-        <span class="demonstration">-</span>
+        <span class="demonstration">~</span>
         <el-date-picker
           v-model="endTime"
           value-format="yyyy-MM-dd"
@@ -41,14 +49,6 @@
           placeholder="选择日期"/>
         <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
       </el-row>
-      <el-row style="margin-top:10px;">
-        <span>进度颜色：</span>
-        <span style="background-color: red">拖期</span>
-        <span style="background-color: yellow">即将拖期</span>
-        <span style="background-color: lawngreen">如期</span>
-        <span style="background-color: deepskyblue">工序外协</span>
-        <span style="background-color: grey">报废</span>
-      </el-row>
     </el-card>
 
     <el-card>
diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index a735c6fb..ac6184ca 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -32,7 +32,7 @@
           style="width: 160px"
           type="date"
           placeholder="选择日期"/>
-        <span class="demonstration">-</span>
+        <span class="demonstration">~</span>
         <el-date-picker
           v-model="endTime"
           value-format="yyyy-MM-dd"