From b9bbce4564422e49992d9312147cc66557f97d83 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 28 Oct 2019 10:22:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/ProcessPlanningNew.js |  11 +
 .../ProcessPlanningNew/index.vue              | 328 +-----------------
 2 files changed, 16 insertions(+), 323 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProcessPlanningNew.js b/src/api/ManufacturingCenter/ProcessPlanningNew.js
index dc9952a0..c4da0966 100644
--- a/src/api/ManufacturingCenter/ProcessPlanningNew.js
+++ b/src/api/ManufacturingCenter/ProcessPlanningNew.js
@@ -526,3 +526,14 @@ export function editGongyi(num, num1) {
     }
   })
 }
+export function dropGongyi(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_删除数据_2027zdyNew',
+      param: `工艺计划流水号=${num}&工序流水号=${num1}`
+    }
+  })
+}
diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
index aae6490a..8eb8efec 100644
--- a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
@@ -30,107 +30,6 @@
       </el-select>
       <el-checkbox v-model="checked" :disabled="isShow2 || (parseInt(token) !== 6 && parseInt(token) !== 19)" size="small" style="margin-left:10px">是否核准</el-checkbox>
       <el-button :disabled="disabled" type="baocun" size="small" icon="el-icon-tickets" @click="saveApprove">保存</el-button>
-      <div v-show="false" style="margin-bottom: 10px;margin-left: 10px">
-        <span style="margin-left: 0">种&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;类:</span>
-        <el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px;margin-top: 5px"/>
-        <span>零件名称:</span>
-        <el-input v-model="partName" placeholder="零件名称" size="small" readonly style="width:100px"/>
-        <span>规格:</span>
-        <el-input v-model="Specifications" placeholder="规格" size="small" readonly style="width:100px"/>
-        <span>投产总数量:</span>
-        <el-input v-model="batchNum" readonly size="small" style="width:100px"/>
-        <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-button slot="append" icon="el-icon-cjn-09" @click="saveMaterial"/>
-        </el-input>
-      </div>
-      <div v-show="false" style="margin-left: 10px">
-        <el-row>
-          <el-col style="width:180px">
-            <span style="margin-left: 0">物料类型:</span>
-            <el-select v-model="materielValue" size="small" style="margin-top: 7px;width:100px;margin-bottom: 3px" placeholder="物料类型" @change="clear()">
-              <el-option
-                v-for="item in materiel"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </el-col>
-
-          <el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="12" style="width: 60%">
-            <span >直&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;径:</span>
-            <el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top: 7px"/>
-            <span>长度:</span>
-            <el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:3px;"/>
-            <el-button style="margin-top: 3px;margin-left: 10px;" type="success" size="small" @click="Calculation1()">计算重量</el-button>
-            <span>重量:</span>
-            <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
-              <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
-            </el-input>
-            <el-button style="margin-left: 10px;" type="success" size="small" @click="insertThestring()">合并生产</el-button>
-          </el-col>
-
-          <el-col v-show="materielValue==='2'||materielValue==='9'||materielValue==='10'||materielValue==='11'" :span="20">
-            <span>长:</span>
-            <el-input-number v-model="Length" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
-            <span>宽:</span>
-            <el-input-number v-model="Width" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
-            <span>厚:</span>
-            <el-input-number v-model="height1" 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="Calculation2()">计算重量
-            </el-button>
-            <span>重量:</span>
-            <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
-              <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
-            </el-input>
-          </el-col>
-
-          <el-col v-show="materielValue==='3'" :span="20">
-            <span>对边宽:</span>
-            <el-input-number v-model="OppositeSideWidth" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
-            <span>长度:</span>
-            <el-input-number v-model="length2" 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="Calculation3()">计算重量
-            </el-button>
-            <span>重量:</span>
-            <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
-              <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
-            </el-input>
-          </el-col>
-
-          <el-col v-show="materielValue==='4'" :span="20">
-            <span>边宽:</span>
-            <el-input-number v-model="biankuan" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
-            <span>边厚:</span>
-            <el-input-number v-model="bianhou" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
-            <span>长度:</span>
-            <el-input-number v-model="changdu" 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="Calculation4()">计算重量
-            </el-button>
-            <span>重量:</span>
-            <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
-              <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
-            </el-input>
-          </el-col>
-
-          <el-col v-show="materielValue==='5'" :span="30">
-            <span>壁厚:</span>
-            <el-input-number v-model="bihou" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
-            <span>外径:</span>
-            <el-input-number v-model="waijing" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
-            <span>长度:</span>
-            <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>
-            <span>重量:</span>
-            <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
-              <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
-            </el-input>
-          </el-col>
-
-        </el-row>
-      </div>
     </el-card>
 
     <el-card>
@@ -150,14 +49,13 @@
             :data="tableData"
             class="processTable"
             border
-            highlight-current-row
             style="width: 967px"
             height="683px"
             size="mini">
             <el-table-column prop="num" label="序号" width="45" align="center" type="index"/>
             <el-table-column prop="name" label="工艺名称" width="180" align="center">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.工艺名称" readonly clearable @change="handleChange(scope.row)" @clear="cleared(scope.row)"/>
+                <el-input v-model="scope.row.工艺名称" readonly clearable @change="handleChange(scope.row)"/>
               </template>
             </el-table-column>
             <el-table-column prop="单件定额工时" label="单件" width="100" align="center">
@@ -225,228 +123,13 @@
         </el-col>
       </el-row>
     </el-card>
-    <el-dialog v-el-drag-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 v-el-drag-dialog :visible.sync="dialogFormVisible2" title="工艺名称、工艺要求选择" center width="400px">
-      <el-form ref="form2" :model="form2" label-position="left" label-width="125px" class="demo-ruleForm">
-        <el-form-item label="工艺名称分类">
-          <el-select v-model="processNameClassValue" filterable placeholder="分类" size="small" @change="cChange()">
-            <el-option
-              v-for="item in processNameClass"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="工艺名称">
-          <el-select v-model="processNameValue" filterable placeholder="名称" size="small" @change="nChange()">
-            <el-option
-              v-for="item in processName"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="工艺要求">
-          <el-select v-model="processRequestValue" placeholder="要求" size="small">
-            <el-option
-              v-for="item in processRequest"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button size="mini" type="primary" @click="confirmSelect()">确定选择</el-button>
-        </el-form-item>
-      </el-form>
-    </el-dialog>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工艺选择" center width="800px">
-      <el-form ref="form" :model="form" label-position="left" label-width="125px" class="demo-ruleForm">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="零件图号">
-              <el-input v-model="partNameValue1" size="small" placeholder="输入零件图号" style="width: 150px" clearable/>
-              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 20px" @click="searchProcess()">查询
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="零件图号">
-              <el-select id="num" v-model="processNumValue" placeholder="零件图号" style="width:150px" size="small" @change="numChange()">
-                <el-option
-                  v-for="item in partName1"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-              <el-button size="small" style="margin-left: 20px" @click="processCopy()">工艺拷贝</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-table
-          :data="tableData2"
-          style="width: 97%;max-height: 300px;margin-top:15px"
-          height="300px"
-          border
-          size="mini">
-          <el-table-column align="center" label="工艺序号" width="80">
-            <template slot-scope="scope">
-              {{ scope.row.工序顺序 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="工艺名称" width="180">
-            <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="80">
-            <template slot-scope="scope">
-              {{ scope.row.工艺难度等级 }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-    </el-dialog>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
-      <el-form ref="form1" :model="form1" label-position="left" label-width="80px" class="demo-ruleForm">
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="零件号">
-              <el-input v-model="PN" size="small" placeholder="输入零件号" style="width: 150px" clearable @change="inputChange"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-button size="small" type="success" icon="el-icon-search" @click="searchProcess1()">查询</el-button>
-            <el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="零件图号">
-              <el-select
-                v-model="tuhaoValue"
-                placeholder="零件图号"
-                size="small"
-                filterable
-                style="width:150px"
-                @change="numChange1()">
-                <el-option
-                  v-for="item in tuhao"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                  <div style="float: left">{{ item.label }}</div>
-                  <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name1 }}</div>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="零件名称">
-              <el-input v-model="remark1" size="small" readonly style="width: 150px;"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="规格">
-              <el-input v-model="guige" size="small" readonly style="width: 150px;"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-table :data="tableData4" style="width: 97%;max-height: 250px;margin-top: 15px" size="mini" border height="250px">
-          <el-table-column align="center" label="工艺序号" width="80">
-            <template slot-scope="scope">
-              {{ scope.row.工序顺序 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="工艺名称" width="120">
-            <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="110">
-            <template slot-scope="scope">
-              {{ scope.row.单件定额工时 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="准结定额工时" width="110">
-            <template slot-scope="scope">
-              {{ scope.row.准结定额工时 }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-    </el-dialog>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="工艺定额人员" center style="min-height: 300px">
-      <el-table :data="tableData3" size="mini" style="width: 97%;max-height: 300px" height="300" highlight-current-row border @row-click="selectPerson">
-        <el-table-column align="center" label="考勤编号" width="150">
-          <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="150">
-          <template slot-scope="scope">
-            {{ scope.row.性别 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="工作岗位" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.岗位名称 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="tijiao()">提交</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import '@/icon/iconfont.css'
 import {
+  dropGongyi,
   editGongyi,
   saveWeight,
   numChange,
@@ -672,9 +355,6 @@ export default {
     this.getList()
   },
   methods: {
-    cleared(row) {
-      console.log(row)
-    },
     onClick(num) {
       if (this.partNumValue) {
         editGongyi(this.partNumValue, num.value).then(response => {
@@ -769,7 +449,7 @@ export default {
       cb(results)
     },
     handleChange(row) {
-      if (row.工艺编号) {
+      if (row.工艺名称) {
         row.工艺要求 = ''
         selectRequest(row.工序流水号, row.工艺计划流水号, row.工艺编号, row.工序顺序, row.工艺要求).then(response => {
           if (response.data[0].result === '1') {
@@ -778,6 +458,8 @@ export default {
             console.log('工艺名称编辑失败')
           }
         })
+      } else {
+        dropGongyi(row.工艺计划流水号, row.工序流水号)
       }
     },
     singleChange(row) {