From b4ba5ee32359d0f8679d5398cca4d72c75f1e32e Mon Sep 17 00:00:00 2001
From: yanggongyan <929128837@qq.com>
Date: Mon, 10 Feb 2020 14:53:17 +0800
Subject: [PATCH] 1

---
 .../WorkshopProcessMaintenance/index.vue      | 27 +++++++++------
 .../ProcessTaskAssignment/index.vue           |  2 +-
 src/views/MarketingCenter/CRM/index.vue       |  2 +-
 .../ContractCapitalManagement/index.vue       |  2 +-
 .../ContractInformationManagement/index.vue   |  2 +-
 .../OfflineProcurement/index.vue              |  5 ---
 .../OutsourcingMaterialsSearch/index.vue      | 34 +++++++++----------
 7 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
index 6f5f66b4..e4be7325 100644
--- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue
+++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
@@ -525,17 +525,22 @@ export default {
       this.temp = 5
     },
     submitTechnologicalRequirements() {
-      addTechnologicalRequirements(this.ProcessNum, this.form3.TechnologicalRequirements).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('增加成功')
-          this.loading3 = true
-          searchTechnologicalRequirementsOfProcessNum(this.ProcessNum).then(response => {
-            this.loading3 = false
-            this.tableData3 = response.data
-          })
-          this.dialogFormVisible5 = false
-        } else { this.$message.error('增加失败') }
-      })
+      if (this.form3.TechnologicalRequirements !== '') {
+        addTechnologicalRequirements(this.ProcessNum, this.form3.TechnologicalRequirements).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('增加成功')
+            this.loading3 = true
+            searchTechnologicalRequirementsOfProcessNum(this.ProcessNum).then(response => {
+              this.loading3 = false
+              this.tableData3 = response.data
+            })
+            this.dialogFormVisible5 = false
+          } else { this.$message.error('增加失败') }
+        })
+      } else {
+        this.$message.error('请输入工艺要求')
+        this.dialogFormVisible5 = false
+      }
     },
     editTechnologicalRequirements(row) {
       this.temp = 6
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index f50ddaa6..cce14df4 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -24,7 +24,7 @@
       </el-select>
       <el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" plain @click="selectAll(tableData)">全选</el-button>
       <el-button type="success" size="small" icon="el-icon-upload" style="margin-left: 10px" plain @click="save">保存</el-button>
-      <el-button type="success" size="small" icon="el-icon-upload" style="margin-left: 10px;float: right" plain @click="currency">通用件保存</el-button>
+      <el-button type="success" size="small" icon="el-icon-upload" style="margin-left: 300px" plain @click="currency">通用件保存</el-button>
     </el-card>
     <el-card>
       <el-table
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index 828e18b1..493fa2b5 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <span>客户名称：</span>
-      <el-select v-model="CustomerNameValue" filterable placeholder="请输入客户名称" style="margin: 3px" size="small" clearable>
+      <el-select v-model="CustomerNameValue" filterable placeholder="请输入客户名称" style="margin: 3px;width: 230px" size="small" clearable>
         <el-option
           v-for="item in CustomerName"
           :key="item.value"
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index 2df6bada..c2fe528f 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -8,7 +8,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px;width: 140px " size="small" clearable>
+      <el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px;width: 220px " size="small" clearable>
         <el-option
           v-for="item in customerNames"
           :key="item.value"
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 5d0f6025..d7360bd9 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <!--      style="background: rgb(233,240,250)"-->
       <div>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin: 3px 10px;">
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:180px;margin: 3px 10px;">
           <el-option
             v-for="item in entryName"
             :key="item.value"
diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
index 3504765a..c4e8f4d6 100644
--- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue
+++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
@@ -81,13 +81,8 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-<<<<<<< HEAD
       <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable()">查询</el-button>
       <el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购计划单</el-button>
-=======
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable()">查询</el-button>
-      <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购计划单</el-button>
->>>>>>> 6d4033c92a46c968832636b84ef2c64c7b192fe4
       <!--<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">-->
       <!--<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存采购计划单</el-button>-->
       <!--</el-tooltip>-->
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
index 63e707fc..2f30b3c0 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -20,26 +20,24 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-<<<<<<< HEAD
+
         <el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
         <el-button type="primary" icon="el-icon-download" plain size="small" @click="exportExcel()">导出</el-button>
-=======
-        <span>备料时间段:</span>
-        <el-date-picker
-          v-model="dateRange"
-          :picker-options="pickerOptions"
-          size="small"
-          type="daterange"
-          align="center"
-          style="width: 300px;margin: 3px 0"
-          value-format="yyyy-MM-dd"
-          format="yyyy-MM-dd"
-          range-separator="～"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"/>
-        <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
-        <el-button type="primary" icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
->>>>>>> 6d4033c92a46c968832636b84ef2c64c7b192fe4
+        <!--        <span>备料时间段:</span>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="dateRange"-->
+        <!--          :picker-options="pickerOptions"-->
+        <!--          size="small"-->
+        <!--          type="daterange"-->
+        <!--          align="center"-->
+        <!--          style="width: 300px;margin: 3px 0"-->
+        <!--          value-format="yyyy-MM-dd"-->
+        <!--          format="yyyy-MM-dd"-->
+        <!--          range-separator="～"-->
+        <!--          start-placeholder="开始日期"-->
+        <!--          end-placeholder="结束日期"/>-->
+        <!--        <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>-->
+        <!--        <el-button type="primary" icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>-->
       </div>
     </el-card>
     <el-card style="width: 76%">