From 1faaade8210e139ed862f4520b82dc1e015cf31d Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 22 Oct 2019 14:32:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreateInquirySheet/index.vue              | 53 +++++++------------
 .../CreatePurchaseContract/index.vue          |  7 +--
 .../OfflineContract/index.vue                 | 28 +++++-----
 .../PurchaseTaskAllocate/index.vue            | 10 +++-
 4 files changed, 42 insertions(+), 56 deletions(-)

diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 29b85b27..fe0b3ab2 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -38,46 +38,35 @@
       <el-col :span="24">
         <el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
           <el-tab-pane label="外购件" name="外购件">
-            <el-row style="margin-bottom: 5px">
-              <span>项目名称:</span>
-              <el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
+            <el-row style="margin-bottom: 10px">
+              <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
                 <el-option
                   v-for="item in project"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"/>
               </el-select>
-              <span>机床图号:</span>
-              <el-select v-model="machineValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
+              <el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable @change="machineChange">
                 <el-option
                   v-for="item in machine"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"/>
               </el-select>
-              <span>组号:</span>
-              <el-select v-model="groupValue" style="width:200px" placeholder="请选择" size="small" clearable filterable>
+              <el-select v-model="groupValue" placeholder="组号" size="small" clearable filterable>
                 <el-option
                   v-for="item in group"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"/>
               </el-select>
-            </el-row>
-            <el-row style="margin-bottom: 5px">
-              <span style="margin-right: -10px">物料状态:</span>
-              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
-              <span>物料名称:</span>
+              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
               <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-              <span>物料变更:</span>
               <el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949"/>
             </el-row>
-            <el-row style="margin-bottom: 15px">
-              <span>物料规格:</span>
+            <el-row style="margin-bottom: 10px">
               <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
-              <span>物料型号:</span>
               <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
-              <span style="margin-left: 10px">时间段:</span>
               <el-date-picker
                 v-model="startTime"
                 size="small"
@@ -254,44 +243,34 @@
             </div>
           </el-tab-pane>
           <el-tab-pane label="基本件" name="基本件">
-            <el-row style="margin-bottom: 5px">
-              <span>项目名称:</span>
-              <el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
+            <el-row style="margin-bottom: 10px">
+              <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
                 <el-option
                   v-for="item in project"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"/>
               </el-select>
-              <span>机床图号:</span>
-              <el-select v-model="machineValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
+              <el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable @change="machineChange">
                 <el-option
                   v-for="item in machine"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"/>
               </el-select>
-              <span>组号:</span>
-              <el-select v-model="groupValue" style="width:200px" placeholder="请选择" size="small" clearable filterable>
+              <el-select v-model="groupValue" placeholder="组号" size="small" clearable filterable>
                 <el-option
                   v-for="item in group"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"/>
               </el-select>
-            </el-row>
-            <el-row style="margin-bottom: 5px">
-              <span style="margin-right: -10px">物料状态:</span>
-              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
-              <span>零件图号:</span>
+              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
               <el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
             </el-row>
             <el-row style="margin-bottom: 10px">
-              <span>零件名称:</span>
               <el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
-              <span>零件规格:</span>
               <el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>
-              <span style="margin-left: 10px">时间段:</span>
               <el-date-picker
                 v-model="endTime"
                 size="small"
@@ -2306,10 +2285,16 @@ export default {
     margin-bottom: 0px;
   }
   .el-select{
-    width:200px
+    width:150px;
+    margin-right: 10px;
   }
   .el-input{
-    width:200px
+    width:150px;
+    margin-right: 10px;
+  }
+  .el-cascader{
+    width:150px;
+    margin: 0px 10px 0px 0px;
   }
   span{
     margin: 10px 0 10px 10px;
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 195f2526..6127b78b 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -179,17 +179,12 @@
       <el-tooltip v-show="false" :open-delay="1000" content="一键删除交货期" placement="right">
         <el-button type="danger" icon="el-icon-date" size="small" @click="deleteAllDate()"/>
       </el-tooltip>
-      <span>①选择合同模板：</span>
       <el-radio-group v-show="false" v-model="demoRadio" size="small" @change="demoChange">
         <el-radio-button label="模板1"/>
         <el-radio-button label="模板2" disabled/>
-        <!--<el-radio-button label="自定义" disabled/>-->
       </el-radio-group>
       <el-button type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
-      <!--<span>②确认合同总额：</span>-->
-      <!--<el-input v-model="actualTotal" size="small" style="width: 100px"/>-->
-      <!--<el-button type="primary" size="small" @click="submitTotal()">确认</el-button>-->
-      <span>②递交审批：</span>
+      <span>递交审批：</span>
       <el-tooltip :open-delay="1000" effect="dark" content="核对信息后生成合同" placement="top">
         <el-button type="success" size="small" @click="generateContract()">递交</el-button>
       </el-tooltip>
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 925dc19d..b2b829b3 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -2,16 +2,10 @@
   <div class="app-container">
     <el-card>
       <div slot="header">
-        <el-row style="margin-bottom: 10px">
-          <span>物料名称:</span>
+        <el-row>
           <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-          <span>物料规格:</span>
           <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
-          <span>物料型号:</span>
           <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
-        </el-row>
-        <el-row style="">
-          <span>物料状态:</span>
           <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin: 0px"/>
           <el-button
             type="success"
@@ -1559,7 +1553,6 @@ export default {
 </script>
 
 <style scoped>
-
   .offlineContract td{
     height: 40px;
     text-align: center;
@@ -1569,12 +1562,7 @@ export default {
   }
   .el-date-editor{
     width:150px;
-  }
-  .el-select{
-    width:195px
-  }
-  .el-input{
-    width:195px
+    margin-right: 10px;
   }
   span{
     margin: 10px 0 10px 10px;
@@ -1593,6 +1581,18 @@ export default {
     right: 15px;
     top: 5px;
   }
+  .el-select{
+    width:150px;
+    margin-right: 10px;
+  }
+  .el-input{
+    width:150px;
+    margin-right: 10px;
+  }
+  .el-cascader{
+    width:150px;
+    margin-right: 10px;
+  }
 </style>
 <style>
   .el-table .MistyRose {
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 72df16c6..2540ca12 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -1124,10 +1124,16 @@ export default {
     margin-bottom: 0px;
   }
   .el-select{
-    width:200px
+    width:150px;
+    margin-right: 10px;
   }
   .el-input{
-    width:200px
+    width:150px;
+    margin-right: 10px;
+  }
+  .el-cascader{
+    width:150px;
+    margin-right: 10px;
   }
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>