From 69be5fc94963685def3f0fffed0cee95b09b8fe7 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 21 Nov 2019 12:19:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=8E=82=E5=AE=B6=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Outsourcing/OutFactoryMaintenance.js  |  4 +-
 .../OutFactoryMaintenance/index.vue           | 11 +++--
 .../OutsourcingTaskExecution/index.vue        | 44 +++++++++----------
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/api/Outsourcing/OutFactoryMaintenance.js b/src/api/Outsourcing/OutFactoryMaintenance.js
index d46d8793..aec5f8ac 100644
--- a/src/api/Outsourcing/OutFactoryMaintenance.js
+++ b/src/api/Outsourcing/OutFactoryMaintenance.js
@@ -21,7 +21,7 @@ export function edittype(ManufacturerNumber, ManufacturerName, ManufacturerAbbre
     data: {
       type: '2',
       name: '车间生产管理工艺_基础表_外协厂家_增加数据',
-      param: '序号=' + ManufacturerNumber + '&外协厂家名称=' + ManufacturerName + '&外协厂家简称=' + ManufacturerAbbreviation + '&地址=' + address + '&联系人=' + roleName + '&电话=' + phNumber + '&传真=' + Fax + '&备注=' + Remarks + '&类别=' + category + '&关注=' + attention + '&设备情况=' + EquipmentCondition
+      param: '序号=' + ManufacturerNumber + '&外协厂家名称=' + ManufacturerName + '&外协厂家简称=' + ManufacturerAbbreviation + '&地址=' + address + '&联系人=' + roleName + '&电话=' + phNumber + '&银行=' + Fax + '&备注=' + Remarks + '&类别=' + category + '&关注=' + attention + '&设备情况=' + EquipmentCondition
     }
   })
 }
@@ -33,7 +33,7 @@ export function handlechange(CoManufacturerFlowNumber, ManufacturerNumber, Manuf
     data: {
       type: '2',
       name: '车间生产管理工艺_基础表_外协厂家_修改数据',
-      param: '外协厂家流水号=' + CoManufacturerFlowNumber + '&序号=' + ManufacturerNumber + '&外协厂家名称=' + ManufacturerName + '&外协厂家简称=' + ManufacturerAbbreviation + '&地址=' + address + '&联系人=' + roleName + '&电话=' + phNumber + '&传真=' + Fax + '&备注=' + Remarks + '&类别=' + category + '&关注=' + attention + '&设备情况=' + EquipmentCondition
+      param: '外协厂家流水号=' + CoManufacturerFlowNumber + '&序号=' + ManufacturerNumber + '&外协厂家名称=' + ManufacturerName + '&外协厂家简称=' + ManufacturerAbbreviation + '&地址=' + address + '&联系人=' + roleName + '&电话=' + phNumber + '&银行=' + Fax + '&备注=' + Remarks + '&类别=' + category + '&关注=' + attention + '&设备情况=' + EquipmentCondition
     }
   })
 }
diff --git a/src/views/Outsourcing/OutFactoryMaintenance/index.vue b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
index 6eacc4ac..6cb5b908 100644
--- a/src/views/Outsourcing/OutFactoryMaintenance/index.vue
+++ b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
@@ -43,6 +43,11 @@
             {{ scope.row.电话 }}
           </template>
         </el-table-column>
+        <el-table-column label="银行" align="center" min-width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.银行 }}
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
             {{ scope.row.备注 }}
@@ -109,8 +114,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="传真" prop="Fax">
-              <el-input v-model="form.Fax" placeholder="传真" clearable size="small"/>
+            <el-form-item label="银行" prop="Fax">
+              <el-input v-model="form.Fax" placeholder="银行" clearable size="small"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -321,7 +326,7 @@ export default {
       this.form.address = row.地址
       this.form.roleName = row.联系人
       this.form.phNumber = row.电话
-      this.form.Fax = row.传真
+      this.form.Fax = row.银行
       this.form.Remarks = row.备注
       this.form.category = row.类别
       this.form.EquipmentCondition = row.设备情况
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 9e3878fa..d330fa6b 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -2,30 +2,28 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span>表单号:</span>
-        <el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:200px;margin-bottom: 10px"/>
+        <!--<span>表单号:</span>-->
+        <!--<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:200px;margin-bottom: 10px"/>-->
         <span>外协厂家:</span>
-        <el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:200px" clearable/>
-        <span>下达任务日期:</span>
-        <el-date-picker
-          type="date"
-          size="small"
-          placeholder="选择日期"/>
-      </el-row>
-      <el-row>
-        <span>单据状态:</span>
-        <el-select v-model="documentStatus" filterable placeholder="请选择" size="small" clearable>
-          <el-option
-            v-for="item in options"
-            :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.name }}</div>
-          </el-option>
-        </el-select>
+        <el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:200px" clearable @keyup.enter.native="pageSize=10;pageList=1;fetchData()"/>
         <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
-        <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">增加</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
+        <!--<span>下达任务日期:</span>-->
+        <!--<el-date-picker-->
+        <!--type="date"-->
+        <!--size="small"-->
+        <!--placeholder="选择日期"/>-->
+        <!--<span>单据状态:</span>-->
+        <!--<el-select v-model="documentStatus" filterable placeholder="请选择" size="small" clearable>-->
+        <!--<el-option-->
+        <!--v-for="item in options"-->
+        <!--: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.name }}</div>-->
+        <!--</el-option>-->
+        <!--</el-select>-->
       </el-row>
     </el-card>
     <el-card>
@@ -436,7 +434,7 @@
     <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="100px" class="demo-ruleForm">
         <el-form-item label="表单号" prop="表单号" style="margin-left: 70px">
-          <el-input v-model="form.表单号" placeholder="表单号" size="small" style="width:70px" disabled/>
+          <el-input v-model="form.表单号" placeholder="表单号" size="small" style="width: 200px" disabled/>
         </el-form-item>
         <el-form-item label="下达任务日期" prop="下达任务日期" style="margin-left: 70px">
           <el-date-picker