From 384e9f58ef4a59e9c949b7f4b2d6dc02783bf653 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sun, 22 Sep 2019 12:23:18 +0800
Subject: [PATCH] a

---
 .../MaintenanceEquipmentPerson/index.vue         |  6 +++---
 .../Inventory/InventoryManagement/index.vue      |  4 ++--
 .../OutsourcingPaymentPlanManagement/index.vue   |  2 +-
 .../Outsourcing/PreorderAssociation/index.vue    |  6 +++---
 .../SupplierManagement/index.vue                 | 16 ++++++++--------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/views/BasicData/MaintenanceEquipmentPerson/index.vue b/src/views/BasicData/MaintenanceEquipmentPerson/index.vue
index 301625a8..8fa29bcc 100644
--- a/src/views/BasicData/MaintenanceEquipmentPerson/index.vue
+++ b/src/views/BasicData/MaintenanceEquipmentPerson/index.vue
@@ -12,7 +12,7 @@
       <span>操作者:</span>
       <el-input v-model="operator" placeholder="操作者" size="small" clearable style="width:200px" @dblclick.native="getOperator();param = 0"/>
       <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="getTableData">查询</el-button>
-      <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" @click="handleAdd">增加</el-button>
+      <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" @click="handleAdd">新增</el-button>
     </el-card>
     <el-card>
       <el-table v-loading="loading" :data="tableData" stripe highlight-current-row border style="height: 500px">
@@ -115,7 +115,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
-        <el-button v-show="title === '增加'" type="primary" @click="submitAdd()">确定</el-button>
+        <el-button v-show="title === '新增设备人员关系'" type="primary" @click="submitAdd()">确定</el-button>
         <el-button v-show="title === '编辑'" type="primary" @click="submitEdit()">确定</el-button>
       </div>
     </el-dialog>
@@ -202,7 +202,7 @@ export default {
       this.getTable(getTableData, [this.equipmentNameCheck, this.equipmentNameValue, this.operatorCheck, this.operatorNum, this.pageCurrent, this.pageSize], ['tableData', 'total', 'loading'])
     },
     handleAdd() {
-      this.addForm('form', [this.dialogFormVisible_form = true, this.title = '增加'])
+      this.addForm('form', [this.dialogFormVisible_form = true, this.title = '新增设备人员关系'])
     },
     handleEdit(row) {
       this.No = row.设备人员关系流水号
diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue
index d8918027..8d04d4ad 100644
--- a/src/views/Inventory/InventoryManagement/index.vue
+++ b/src/views/Inventory/InventoryManagement/index.vue
@@ -103,7 +103,7 @@
       </el-table>
     </el-card>
     <!--仓库表单-->
-    <el-dialog :visible.sync="dialogFormVisible" title="仓库" center width="450px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="仓库" center width="450px">
       <el-form ref="form" :model="form" :rules="rules" label-position="center" label-width="110px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
@@ -180,7 +180,7 @@
       </div>
     </el-dialog>
     <!--货位表单-->
-    <el-dialog :visible.sync="dialogFormVisible2" title="货位" center style="min-height: 300px" width="400px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="货位" center style="min-height: 300px" width="400px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 3de74cd7..12ac0cab 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -297,7 +297,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
+    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index 03d290be..177c73de 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -107,18 +107,18 @@
             <el-checkbox :disabled="parseInt(scope.row.工序状态)!==3||parseInt(scope.row.工艺编号)===29" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
           </template>
         </el-table-column>
-        <el-table-column label="是否外协" width="750" align="center">
+        <el-table-column label="是否外协" width="120" align="center">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small">是</el-tag>
             <el-tag v-else size="small">否</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="工艺名称" align="center" min-width="120px">
+        <el-table-column label="工艺名称" align="center" width="120px">
           <template slot-scope="scope">
             {{ scope.row.工艺名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="工艺要求" align="center" width="580px">
+        <el-table-column label="工艺要求" align="center" min-width="300">
           <template slot-scope="scope">
             <el-input v-model="scope.row.工艺要求" :autosize="{ minRows: 1, maxRows: 1}" size="mini" readonly type="textarea"/>
           </template>
diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue
index f65b9bf1..9da66eda 100644
--- a/src/views/PurchasingCenter/SupplierManagement/index.vue
+++ b/src/views/PurchasingCenter/SupplierManagement/index.vue
@@ -65,7 +65,7 @@
           </el-col>
           <el-col style="width: 250px;margin:2px 0 0 15px">
             <el-button type="success" size="small" icon="el-icon-search" @click="pageCurrent = 1;fetchData()">查询</el-button>
-            <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">增加</el-button>
+            <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -73,7 +73,7 @@
 
     <el-card>
       <div style="display: inline-block;margin-bottom: 20px">供应商列表</div>
-      <el-table :data="List" highlight-current-row border style="width: 100%;max-height: 600px;" height="600" size="mini" @row-click="rowClick">
+      <el-table :data="List" stripe highlight-current-row border style="width: 100%;max-height: 600px;" height="600" size="mini" @row-click="rowClick">
         <el-table-column label="供应商名称" align="center" fixed="left" min-width="250">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -154,8 +154,8 @@
     </el-card>
     <el-card>
       <div style="display: inline-block;margin-bottom: 20px;width:90%">供应商联系人列表</div>
-      <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-bottom:10px;float:right" @click="handleAdd2()">增加</el-button>
-      <el-table :data="List1" border size="mini">
+      <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-bottom:10px;float:right" @click="handleAdd2()">新增</el-button>
+      <el-table :data="List1" border stripe size="mini">
         <el-table-column label="姓名" align="center">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
@@ -190,7 +190,7 @@
       </el-table>
     </el-card>
 
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
+    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
@@ -306,12 +306,12 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
-        <el-button v-show="title==='增加'" type="primary" @click="submitAdd('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>
       </div>
     </el-dialog>
 
-    <el-dialog :title="title2" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="400px">
+    <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="400px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="80px" class="demo-ruleForm">
         <el-form-item label="姓名" prop="姓名">
           <el-input v-model="form2.姓名" size="small" clearable/>
@@ -441,7 +441,7 @@ export default {
         this.$refs['form'].resetFields()
       }
       this.dialogFormVisible = true
-      this.title = '增加'
+      this.title = '新增供应商'
       this.form.供应商名称 = ''
       this.form.企业性质 = ''
       this.form.创立日期 = ''