From b284fd5cef054469f737f4f24611b300522e30d2 Mon Sep 17 00:00:00 2001
From: "liulujia@meswork.com" <liulujia@meswork.com>
Date: Thu, 6 Feb 2020 14:39:55 +0800
Subject: [PATCH] 20200206LLJV1

---
 .../SparePartsOutStockRecord/index.vue         |  3 ++-
 .../CreatingPurchasingMaterials/index.vue      | 10 +++++++++-
 .../NewArrivalList/index.vue                   | 13 ++++++++-----
 .../OutsourcingMaterialsInvoice/index.vue      | 18 +++++++++---------
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue
index 63e5c46a..2f7b7a27 100644
--- a/src/views/Assembly/SparePartsOutStockRecord/index.vue
+++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue
@@ -127,12 +127,13 @@ export default {
       } else {
         this.ordername = ''
       }
-      console.log(this.ordername, 9990999)
       if (column.order === 'ascending') {
         this.order = 1
       } else if (column.order === 'descending') { this.order = 2 } else {
         this.order = ''
       }
+      console.log(this.ordername, 9990999, this.order)
+
       this.selecttable()
     },
     initProject() {
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index 454bd399..b1370518 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -228,7 +228,7 @@
       </el-table>
     </el-card>
 
-    <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px">
+    <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px" @close="closedialog()">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -610,6 +610,14 @@ export default {
       this.form2.计划完成日期 = ''
       this.dialogVisible2 = true
     },
+    closedialog() {
+      this.form2.采购计划流水号 = ''
+      this.form2.采购单名称 = ''
+      this.form2.supplierNameValue = ''
+      this.form2.计划完成日期 = ''
+      this.form2.供应商名称 = ''
+      this.form2.计划完成日期 = ''
+    },
     submitAddPurchaseOrder() { // 新建采购单
       this.$refs['form2'].validate((valid) => {
         if (valid) {
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index eede78fb..46cdd120 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -36,7 +36,7 @@
             <el-tag v-else type="primary" size="mini">未结算</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" prop="供应商名称" align="center" width="200">
+        <el-table-column label="供应商" prop="供应商名称" align="center" width="260" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -46,12 +46,12 @@
             {{ scope.row.日期.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="到货单号" align="center" width="150">
+        <el-table-column label="到货单号" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.到货单编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200" fixed="right">
+        <el-table-column label="操作" align="center" width="170" fixed="right">
           <template slot-scope="scope">
             <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addArrivalOrderMX(scope.row)">到货明细</el-button>
             <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)">删除</el-button>
@@ -550,11 +550,11 @@ export default {
       planTypes: [
         {
           value: 0,
-          label: '采购计划'
+          label: '备料采购计划'
         },
         {
           value: 1,
-          label: '离线采购计划'
+          label: '备料（离线）采购计划'
         }
       ],
       arrest: [],
@@ -761,6 +761,9 @@ export default {
           } else {
             sums[index] = 'N/A'
           }
+        } else if (index === 3) {
+          sums[index] = 'KG'
+          return
         } else if (index === 4) {
           sums[index] = '总金额：'
           return
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index 49d42f0f..8592ba4f 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -121,7 +121,7 @@
                   :disabled="Number(scope.row.是否请款)===1"
                   type="text"
                   size="mini"
-                  icon="el-icon-delete"
+                  icon="el-icon-right"
                   style="margin-left: 20px"
                   @click="deleteTable1(scope.row)"/>
               </div>
@@ -142,7 +142,7 @@
       </div>
     </el-card>
     <el-card style="float: left;width: 41.3%;margin-left: 5px">
-      <el-table :data="gridData" class="subTableHeader" show-summary stripe border size="mini" style="width: 100%">
+      <el-table :data="gridData" class="subTableHeader" show-summary border size="mini" style="width: 100%">
         <el-table-column width="50" align="center" type="index" label="序号"/>
         <el-table-column label="到货单编号" align="center">
           <template slot-scope="scope">
@@ -177,7 +177,7 @@
     <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="800px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="110px">
         <div style="width: 45%;float: left;margin-top: 5px">
-          <div style="background: gainsboro">
+          <div style="background: white">
             <el-form-item label="供应商" prop="supplierNameValue">
               <el-select v-model="form1.supplierNameValue" placeholder="供应商" size="small" filterable @change="Name=form1.supplierNameValue;searchTable4()">
                 <el-option
@@ -190,10 +190,10 @@
             <el-form-item label="发票号" prop="money">
               <el-input v-model="form1.Number" size="small" placeholder="发票号"/>
             </el-form-item>
-            <el-form-item label="开票时间" prop="invoiceTime">
+            <el-form-item label="到票时间" prop="invoiceTime">
               <el-date-picker v-model="form1.invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
             </el-form-item>
-            <el-form-item label="开票金额" prop="money">
+            <el-form-item label="到票金额" prop="money">
               <el-input v-model="form1.money" size="small" placeholder="开票金额"/>
             </el-form-item>
             <el-form-item label="备注" prop="remark">
@@ -224,8 +224,8 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible1 = false">取消</el-button>
-        <el-button v-show="title1==='新增备料发票'" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
-        <el-button v-show="title1==='编辑备料发票'" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
+        <el-button v-show="title1==='新增备料到票'" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
+        <el-button v-show="title1==='编辑备料到票'" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
       </div>
     </el-dialog>
 
@@ -417,7 +417,7 @@ export default {
       if (this.$refs['form1'] !== undefined) {
         this.$refs['form1'].resetFields()
       }
-      this.title1 = '新增备料发票'
+      this.title1 = '新增备料到票'
       this.tableData4 = []
       this.dialogVisible1 = true
       console.log(this.supplierNames)
@@ -457,7 +457,7 @@ export default {
       if (this.$refs['form1'] !== undefined) {
         this.$refs['form1'].resetFields()
       }
-      this.title1 = '编辑备料发票'
+      this.title1 = '编辑备料到票'
       this.dialogVisible1 = true
       this.form1.invoiceNumValue = row.发票流水号
       this.form1.invoiceTime = row.开票时间