From 220d52eb4a4937eb88bd4285f19b24e94eed8595 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sun, 13 Oct 2019 09:02:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasingCenter/MaterialMProcure/index.vue      |  5 ++---
 .../PurchasingCenter/MaterialManagement/index.vue    | 12 ++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/views/PurchasingCenter/MaterialMProcure/index.vue b/src/views/PurchasingCenter/MaterialMProcure/index.vue
index 52823d57..aa967899 100644
--- a/src/views/PurchasingCenter/MaterialMProcure/index.vue
+++ b/src/views/PurchasingCenter/MaterialMProcure/index.vue
@@ -318,8 +318,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel('form')">取消</el-button>
-        <el-button v-show="title==='增加'" type="primary" @click="submitAdd('form')">确定</el-button>
-        <el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
+        <el-button v-show="title==='新增物料申请'" type="primary" @click="submitAdd('form')">提交技术审核</el-button>
       </div>
     </el-dialog>
 
@@ -580,7 +579,7 @@ export default {
       this.MaterialCategory1 = []
       this.MaterialVariety1 = []
       this.getSelect(initMaterialCategory, ['物料类别', '物料类别流水号'], 'MaterialCategory1')
-      this.addForm('form', [this.dialogFormVisible1 = true, this.title = '增加'])
+      this.addForm('form', [this.dialogFormVisible1 = true, this.title = '新增物料申请'])
     },
     submitAdd() { // 提交增加
       this.addTable(addData, [this.form.物料品种流水号, this.form.物料名称, this.form.物料全名, this.form.物料规格, this.form.物料型号, this.form.计量单位流水号, this.form.物料来源流水号, this.form.GonghuoshangValue], 'form', function() {
diff --git a/src/views/PurchasingCenter/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue
index 5450644a..949512f1 100644
--- a/src/views/PurchasingCenter/MaterialManagement/index.vue
+++ b/src/views/PurchasingCenter/MaterialManagement/index.vue
@@ -113,7 +113,7 @@
           <!--clearable-->
           <!--@dblclick.native="param=0;openSupplier()"/>-->
         </el-col>
-        <el-col style="width: 550px">
+        <el-col style="width: 600px">
           <el-button
             type="success"
             icon="el-icon-search"
@@ -132,7 +132,7 @@
           </el-button>
           <el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="open()">新增供货商</el-button>
           <el-badge :value="weishenhe" class="item">
-            <el-button type="primary" size="small" @click="daishenhe()">采购物料审核</el-button>
+            <el-button type="primary" plain size="small" @click="daishenhe()">采购部新增物料审核</el-button>
           </el-badge>
         </el-col>
       </el-row>
@@ -484,7 +484,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="采购部申请物料" center style="min-height: 300px" width="700px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="采购部新增物料审核" center style="min-height: 300px" width="700px">
       <el-form>
         <el-table
           :data="tableData5"
@@ -517,7 +517,7 @@
           <el-table-column label="操作" fixed="right" align="center" width="150">
             <template slot-scope="scope">
               <div style="display: inline-block">
-                <el-button type="primary" size="small" @click="Tongguo(scope.row)">通过</el-button>
+                <el-button type="primary" plain size="small" @click="Tongguo(scope.row)">通过</el-button>
               </div>
               <div style="display: inline-block">
                 <el-popover
@@ -527,7 +527,7 @@
                   <span>打回原因：</span>
                   <el-input v-model="打回原因" placeholder="打回原因" size="small" clearable/>
                   <el-button type="danger" size="small" @click="queren()">确认</el-button>
-                  <el-button slot="reference" type="danger" size="small" @click="Dahui(scope.row)">打回</el-button>
+                  <el-button slot="reference" type="danger" plain size="small" @click="Dahui(scope.row)">打回</el-button>
                 </el-popover>
               </div>
             </template>
@@ -681,7 +681,7 @@ export default {
   methods: {
     // 通过
     Tongguo(row) {
-      this.$confirm('通过该物料, 是否继续?', '提示', {
+      this.$confirm('是否通过?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'