From 9d70d2a3e0360db996eea0f1fa40d82d61c5e259 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Sat, 17 Nov 2018 09:55:51 +0800
Subject: [PATCH 01/16] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AF=A2=E4=BB=B7?=
 =?UTF-8?q?=E5=8D=95=EF=BC=9A=E5=88=9B=E5=BB=BA=E5=8D=95=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=BC=B9=E6=A1=86=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PurchasingCenter/CreateInquirySheet/index.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index e831bde9..893556f5 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -318,9 +318,7 @@
           <el-input v-model="form2.inquirySheetNum" size="small"/>
         </el-form-item>
         <el-form-item label="供应商" prop="supplierName">
-          <el-input v-model="form2.supplierName" size="small" readonly>
-            <el-button slot="append" icon="el-icon-search" @click="dialogVisible1=true"/>
-          </el-input>
+          <el-input v-model="form2.supplierName" size="small" readonly @focus="dialogVisible1=true"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

From b369087c656b4b88ea10c85bb139bf747ea13644 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Sat, 17 Nov 2018 10:21:12 +0800
Subject: [PATCH 02/16] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=EF=BC=9Areload=E5=88=B7=E6=96=B0=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=9Breadonly=E5=90=88=E5=90=8C=E6=80=BB=E9=A2=9D=EF=BC=9B?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E8=A7=84=E5=AE=9A=E5=88=B0=E8=B4=A7=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   | 22 +++++++++++++++++--
 .../PurchasingCenter/CreateContract/index.vue | 10 ++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 721d3a32..cb46977e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,11 +1,29 @@
 <template>
   <div id="app">
-    <router-view/>
+    <router-view v-if="isRouterAlive"/>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'App'
+  name: 'App',
+  provide() {
+    return {
+      reload: this.reload
+    }
+  },
+  data() {
+    return {
+      isRouterAlive: true
+    }
+  },
+  methods: {
+    reload() {
+      this.isRouterAlive = false
+      this.$nextTick(function() {
+        this.isRouterAlive = true
+      })
+    }
+  }
 }
 </script>
diff --git a/src/views/PurchasingCenter/CreateContract/index.vue b/src/views/PurchasingCenter/CreateContract/index.vue
index 8edbfa7b..5c85a1a3 100644
--- a/src/views/PurchasingCenter/CreateContract/index.vue
+++ b/src/views/PurchasingCenter/CreateContract/index.vue
@@ -186,7 +186,7 @@
         style="margin-top:10px"
         @click="calculateContractSum">计算合同总额</el-button>
       <span>合同总额:</span>
-      <el-input v-model="contractSum" size="small"/>
+      <el-input v-model="contractSum" size="small" readonly/>
     </el-card>
 
     <el-card>
@@ -237,10 +237,10 @@ export default {
       searchView: '',
       fileList: [],
       minDate: null,
-      endDateOpt: { // 为了让规定到货时间早于物料计划到货时间
+      endDateOpt: { // 禁用大于规定到货日期和小于当前日期
         disabledDate: (time) => {
           if (this.minDate) {
-            return time.getTime() > this.minDate
+            return time.getTime() > this.minDate || time.getTime() < new Date()
           }
         }
       },
@@ -262,8 +262,8 @@ export default {
       payTime5Value: '', // 付款时间
       payTime6Value: '', // 付款时间
       freight: '', // 运费
-      taxRate: '', // 税率
-      currencyValue: '', // 币种
+      taxRate: '0.17', // 税率
+      currencyValue: 1, // 币种
       currency: [
         {
           label: '人民币',

From fd568c195fd4304bd33c37ed478ab5410a8f5dec Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Sat, 17 Nov 2018 10:43:41 +0800
Subject: [PATCH 03/16] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AF=A2=E4=BB=B7?=
 =?UTF-8?q?=E5=8D=95=EF=BC=9A=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PurchasingCenter/CreateInquirySheet/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 893556f5..db2979f5 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -322,17 +322,16 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible2=false">取消</el-button>
         <el-button
           v-show="title2==='创建询价单'"
           type="primary"
           size="small"
-          icon="el-icon-check"
           @click="submitCreateInquirySheet">确定</el-button>
         <el-button
           v-show="title2==='编辑询价单'"
           type="primary"
           size="small"
-          icon="el-icon-check"
           @click="submitEditInquirySheet">确定</el-button>
       </div>
     </el-dialog>
@@ -340,7 +339,7 @@
     <el-dialog :visible.sync="dialogVisible3" title="物料变更选择" center style="min-height: 300px;" width="780px">
       <span>物料名称：</span>
       <el-input v-model="materialName0" placeholder="物料名称" size="small" clearable/>
-      <el-button type="success" size="small" icon="el-icon-search" @click="pageCurrent02=1;pageSize02=10;total02=0;searchMaterial()">查询</el-button>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="pageCurrent02=1;pageSize02=10;total02=0;searchMaterial()">查询</el-button>
       <el-table :data="tableData02" size="mini" style="width: 97%;max-height: 300px;margin-top:15px" height="400px" border highlight-current-row @row-click="selectNewMaterial">
         <el-table-column align="center" label="物料名称" min-width="150">
           <template slot-scope="scope">
@@ -372,7 +371,8 @@
       <span style="font-size: large;color: red">将原物料替换为: {{ materialNew }}</span>
       <!--<el-input v-model="materialNew" size="small" readonly style="margin: 10px 10px 0 10px"></el-input>-->
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" size="small" icon="el-icon-check" @click="submitMaterialChange">确定</el-button>
+        <el-button size="small" @click="dialogVisible3=false">取消</el-button>
+        <el-button type="primary" size="small" @click="submitMaterialChange">确定</el-button>
       </div>
     </el-dialog>
   </div>

From 5394a173275c64e686238a0ecc23081aa6b848a5 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Sat, 17 Nov 2018 10:49:46 +0800
Subject: [PATCH 04/16] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=EF=BC=9A=E5=AE=A1=E6=89=B9=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PurchasingCenter/PurchaseContractApproval/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
index 10ec2187..6f3a868c 100644
--- a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
@@ -165,6 +165,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible3=false">取消</el-button>
         <el-button type="primary" size="small" @click="submitApproval('form2')">确定</el-button>
       </div>
     </el-dialog>

From 9e6bde4efa5d6a32838ad188e467fcdbb7d555cd Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Sat, 17 Nov 2018 10:59:11 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=EF=BC=9A=E9=87=87=E8=B4=AD=E5=91=98clearable?=
 =?UTF-8?q?=EF=BC=9B=E6=96=B0=E5=A2=9E=E5=8F=98=E6=9B=B4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasingCenter/ContractChange/index.vue | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/views/PurchasingCenter/ContractChange/index.vue b/src/views/PurchasingCenter/ContractChange/index.vue
index c83b801e..5a587a48 100644
--- a/src/views/PurchasingCenter/ContractChange/index.vue
+++ b/src/views/PurchasingCenter/ContractChange/index.vue
@@ -26,7 +26,7 @@
               </el-option>
             </el-select>
             <span>采购员:</span>
-            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
+            <el-select v-model="personValue" placeholder="采购员" size="small" clearable style="width: 100px">
               <el-option
                 v-for="item in person"
                 :key="item.value"
@@ -186,7 +186,7 @@
               </el-option>
             </el-select>
             <span>采购员:</span>
-            <el-select v-model="personValue3" placeholder="采购员" size="small" style="width: 100px">
+            <el-select v-model="personValue3" placeholder="采购员" size="small" clearable style="width: 100px">
               <el-option
                 v-for="item in person"
                 :key="item.value"
@@ -494,16 +494,27 @@ export default {
     },
     contractChange() {
       if (this.contractValue) {
-        contractChange(this.contractValue, this.changeReason).then(response => {
-          this.contractValue = ''
-          this.changeReason = ''
-          if (response.data[0].result === '1') {
-            this.$message.success('变更成功')
-            this.searchTable1()
-            this.contractNumValue = ''
-            this.contractNumValue3 = ''
-            this.fetchData()
-          } else { this.$message.error('变更失败') }
+        this.$confirm('确定更改该合同?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          contractChange(this.contractValue, this.changeReason).then(response => {
+            this.contractValue = ''
+            this.changeReason = ''
+            if (response.data[0].result === '1') {
+              this.$message.success('变更成功')
+              this.searchTable1()
+              this.contractNumValue = ''
+              this.contractNumValue3 = ''
+              this.fetchData()
+            } else { this.$message.error('变更失败') }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
+          })
         })
       } else {
         this.$message.error('请先选择合同')

From e0e1124a9d84be96fefad06ad507a5066586409b Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 17 Nov 2018 11:11:06 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index a8158773..1aed1d9b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -10,7 +10,7 @@ export const name = `OP8888`
 export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx`
 export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.1.122:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 

From 42b47c94c2706ce5f8afd34d8e196aab9b520771 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Sat, 17 Nov 2018 13:54:53 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=91=98=E8=AF=B7?=
 =?UTF-8?q?=E6=AC=BE=EF=BC=9A=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=9B=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=9B?=
 =?UTF-8?q?=E9=80=9A=E8=AE=AF=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/PurchasingCenter/BuyerRequestFund.js  |   2 +-
 src/utils/request.js                          |   2 +-
 .../BuyerRequestFund/index.vue                | 326 +++---------------
 3 files changed, 41 insertions(+), 289 deletions(-)

diff --git a/src/api/PurchasingCenter/BuyerRequestFund.js b/src/api/PurchasingCenter/BuyerRequestFund.js
index 28c3cc8b..1e66716b 100644
--- a/src/api/PurchasingCenter/BuyerRequestFund.js
+++ b/src/api/PurchasingCenter/BuyerRequestFund.js
@@ -20,7 +20,7 @@ export function searchTable1(pageCurrent, pageSize, check1, start, end, check2,
     data: {
       type: '1',
       name: '采购管理_请款表_查询数据',
-      param: '时间段_check=' + check1 + '&开始时间=' + start + '&结束时间=' + end + '&合同号_check=' + check2 + '&采购合同编号=' + num1 + '&采购员_check=' + check3 + '&采购员姓名=' + name1 + '&供应商_check=' + check4 + '&供应商名称=' + name2,
+      param: '时间段_check=' + check1 + '&开始时间=' + start + '&结束时间=' + end + '&合同号_check=' + check2 + '&采购合同编号=' + num1 + '&采购员_check=' + check3 + '&采购员流水号=' + name1 + '&供应商_check=' + check4 + '&供应商名称=' + name2,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/utils/request.js b/src/utils/request.js
index a8158773..1aed1d9b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -10,7 +10,7 @@ export const name = `OP8888`
 export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx`
 export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.1.122:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/PurchasingCenter/BuyerRequestFund/index.vue b/src/views/PurchasingCenter/BuyerRequestFund/index.vue
index 762352a6..300f5fe0 100644
--- a/src/views/PurchasingCenter/BuyerRequestFund/index.vue
+++ b/src/views/PurchasingCenter/BuyerRequestFund/index.vue
@@ -20,24 +20,20 @@
       <span>合同号:</span>
       <el-input v-model="contractNum" placeholder="合同号" size="small" style="width:180px" clearable/>
       <span>采购员:</span>
-      <el-input
-        v-model="buyerName"
-        placeholder="采购员"
-        size="small"
-        readonly
-        clearable
-        style="width:100px"
-        @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true"/>
+      <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px" clearable>
+        <el-option
+          v-for="item in person"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
       <span>供应商:</span>
       <el-input
         v-model="supplierName"
         placeholder="供应商"
         size="small"
-        readonly
         clearable
-        style="width:180px"
-        @dblclick.native="dialogVisible1=true;submitDisable=true"
-        @clear="emptySupplierDetail"/>
+        style="width:180px"/>
       <el-button
         type="success"
         size="small"
@@ -48,19 +44,19 @@
 
     <el-card>
       <el-table v-loading="loading1" :data="tableData1" size="mini" border style="width: 100%;">
-        <el-table-column label="采购合同编号" min-width="150" align="center">
+        <el-table-column label="采购合同编号" min-width="100" align="center">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同名称" min-width="150" align="center">
+        <el-table-column label="采购合同名称" min-width="100" align="center">
           <template slot-scope="scope">
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
         <el-table-column label="规定到货时间" width="100" align="center">
           <template slot-scope="scope">
-            {{ scope.row.规定到货时间 }}
+            {{ scope.row.规定到货时间.split(' ')[0] }}
           </template>
         </el-table-column>
         <el-table-column label="供应商" min-width="200" align="center">
@@ -78,7 +74,7 @@
             {{ scope.row.付款方式内容 }}
           </template>
         </el-table-column>
-        <el-table-column label="欠款金额" min-width="100" align="center">
+        <el-table-column label="欠款金额" min-width="90" align="center">
           <template slot-scope="scope">
             {{ scope.row.欠款金额 }}
           </template>
@@ -93,7 +89,7 @@
             <el-input v-model="scope.row.本次应请款" size="mini" style="width:70px"/>
           </template>
         </el-table-column>
-        <el-table-column label="请款付款情况" width="810" align="center">
+        <el-table-column label="请款付款情况" width="900" align="center">
           <template slot-scope="scope">
             <el-table v-show="tableData11[scope.$index].length!==0" :data="tableData11[scope.$index]" size="mini" border style="width: 100%;">
               <el-table-column label="次数" min-width="60" align="center" type="index"/>
@@ -104,25 +100,25 @@
               </el-table-column>
               <el-table-column label="请款时间" width="90" align="center">
                 <template slot-scope="scope">
-                  {{ scope.row.请款时间 }}
+                  {{ scope.row.请款时间.split(' ')[0] }}
                 </template>
               </el-table-column>
-              <el-table-column label="审核情况内容" width="80" align="center">
+              <el-table-column label="审核情况" width="80" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.审核情况内容 }}
                 </template>
               </el-table-column>
-              <el-table-column label="未通过审核原因" width="80" align="center">
+              <el-table-column label="未通过审核原因" width="110" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.未通过审核原因 }}
                 </template>
               </el-table-column>
-              <el-table-column label="审批情况内容" width="80" align="center">
+              <el-table-column label="审批情况" width="80" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.审批情况内容 }}
                 </template>
               </el-table-column>
-              <el-table-column label="未通过审批原因" width="80" align="center">
+              <el-table-column label="未通过审批原因" width="110" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.未通过审批原因 }}
                 </template>
@@ -132,7 +128,7 @@
                   {{ scope.row.付款情况内容 }}
                 </template>
               </el-table-column>
-              <el-table-column label="未付款原因" width="80" align="center">
+              <el-table-column label="未付款原因" width="110" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.未付款原因 }}
                 </template>
@@ -142,7 +138,6 @@
                   <el-button
                     type="danger"
                     size="mini"
-                    icon=""
                     @click="cancelRequestFund(scope.row)">取消请款</el-button>
                 </template>
               </el-table-column>
@@ -217,15 +212,10 @@
         </el-table-column>
         <el-table-column label="规定到货时间" width="100" align="center">
           <template slot-scope="scope">
-            {{ scope.row.规定到货时间 }}
+            {{ scope.row.规定到货时间.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="实际到货时间" width="100" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.实际到货时间 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="供应商" min-width="150" align="center">
+        <el-table-column label="供应商" min-width="250" align="center">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -257,170 +247,23 @@
         </el-table-column>
         <el-table-column label="请款时间" width="100" align="center">
           <template slot-scope="scope">
-            {{ scope.row.请款时间 }}
+            {{ scope.row.请款时间.split(' ')[0] }}
           </template>
         </el-table-column>
       </el-table>
     </el-card>
-
-    <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
-      <el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="供应商名称">
-              <el-input v-model="supplierName" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="企业性质">
-              <el-input v-model="enterpriseNature" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="货期">
-              <el-input v-model="goodTime" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="注册资本">
-              <el-input v-model="registeredCapital" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="税号">
-              <el-input v-model="taxNum" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电子邮箱">
-              <el-input v-model="EMail" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="地址">
-              <el-input v-model="address" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="账号">
-              <el-input v-model="account" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="开户行">
-              <el-input v-model="openingBank" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电话号码">
-              <el-input v-model="phone" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="传真">
-              <el-input v-model="fax" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-button
-              type="success"
-              size="small"
-              icon="el-icon-search"
-              @click="searchSupplier">查询</el-button>
-            <el-button
-              :disabled="submitDisable"
-              type="primary"
-              size="small"
-              icon="el-icon-check"
-              @click="submitSelectSupplier">确定</el-button>
-            <el-button
-              type="danger"
-              size="small"
-              icon="el-icon-delete"
-              @click="emptySupplierDetail">清空</el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="tableData01" size="mini" style="width: 97%;max-height: 300px;margin-top:15px" height="200px" border @row-click="showSupplierDetail">
-          <el-table-column align="center" label="供应商名称" width="200">
-            <template slot-scope="scope">
-              {{ scope.row.供应商名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="企业性质">
-            <template slot-scope="scope">
-              {{ scope.row.企业性质 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="创立日期">
-            <template slot-scope="scope">
-              {{ scope.row.创立日期 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="注册资本">
-            <template slot-scope="scope">
-              {{ scope.row.注册资本 }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-    </el-dialog>
-
-    <el-dialog :visible.sync="dialogVisible2" title="采购员选择" center style="min-height: 300px;" width="40%">
-      <el-table
-        :data="tableData02"
-        size="small"
-        border
-        style="width: 100%;min-height:300px"
-        height="300px"
-        highlight-current-row
-        @row-click="clickBuyer">
-        <el-table-column label="考勤编号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.考勤编号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="姓名" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="性别" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.性别 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工作岗位" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.岗位名称 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button :disabled="submitDisable" type="primary" size="small" icon="el-icon-check" @click="submitSelectBuyer">确定</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { searchSupplier, searchTable1, requestFund, searchCondition, cancelRequestFund, searchRequestTable, initBuyer } from '@/api/PurchasingCenter/BuyerRequestFund'
+import { searchTable1, requestFund, searchCondition, cancelRequestFund, searchRequestTable, initBuyer } from '@/api/PurchasingCenter/BuyerRequestFund'
 import { mapGetters } from 'vuex'
 
 export default {
   data() {
     return {
-      tableData02: [],
-      dialogVisible2: false,
+      personValue: '',
+      person: [],
       loading2: false,
       tableData2: [],
       tableData11: [],
@@ -430,35 +273,9 @@ export default {
       startDate: '',
       endDate: '',
       contractNum: '',
-      buyerName: '',
-      dialogVisible1: false,
       submitDisable: true,
       form1: {},
-      supplierValue: '',
       supplierName: '',
-      enterpriseNature: '',
-      createDate: '',
-      registeredCapital: '',
-      taxNum: '',
-      EMail: '',
-      address: '',
-      account: '',
-      openingBank: '',
-      phone: '',
-      fax: '',
-      goodTime: '',
-      supplierCheck1: 0,
-      supplierCheck2: 0,
-      supplierCheck3: 0,
-      supplierCheck4: 0,
-      supplierCheck5: 0,
-      supplierCheck6: 0,
-      supplierCheck7: 0,
-      supplierCheck8: 0,
-      supplierCheck9: 0,
-      supplierCheck10: 0,
-      supplierCheck11: 0,
-      supplierCheck12: 0,
       tableData01: [],
       loading1: false,
       tableData1: [],
@@ -479,98 +296,39 @@ export default {
       'id'
     ])
   },
+  created() {
+    this.initBuyer()
+  },
   methods: {
-    submitSelectBuyer() { // 确定
-      this.dialogVisible2 = false
-    },
-    clickBuyer(row) { // 点击采购员表某一行
-      this.submitDisable = false
-      this.buyerName = row.姓名
-    },
     initBuyer() { // 初始化采购人员
       initBuyer().then(response => {
-        this.tableData02 = response.data
+        for (let i = 0; i < response.data.length; i++) {
+          this.person.push({
+            text: response.data[i].姓名,
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
       })
     },
-    searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
-      this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')
-      this.enterpriseNature ? this.supplierCheck2 = 1 : (this.supplierCheck2 = 0, this.enterpriseNature = '')
-      this.createDate ? this.supplierCheck3 = 1 : (this.supplierCheck3 = 0, this.createDate = '')
-      this.registeredCapital ? this.supplierCheck4 = 1 : (this.supplierCheck4 = 0, this.registeredCapital = '')
-      this.taxNum ? this.supplierCheck5 = 1 : (this.supplierCheck5 = 0, this.taxNum = '')
-      this.EMail ? this.supplierCheck6 = 1 : (this.supplierCheck6 = 0, this.EMail = '')
-      this.address ? this.supplierCheck7 = 1 : (this.supplierCheck7 = 0, this.address = '')
-      this.account ? this.supplierCheck8 = 1 : (this.supplierCheck8 = 0, this.account = '')
-      this.openingBank ? this.supplierCheck9 = 1 : (this.supplierCheck9 = 0, this.openingBank = '')
-      this.phone ? this.supplierCheck10 = 1 : (this.supplierCheck10 = 0, this.phone = '')
-      this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '')
-      this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '')
-      searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => {
-        this.tableData01 = response.data
-      })
-    },
-    submitSelectSupplier() { // 确定选择供应商
-      this.dialogVisible1 = false
-    },
-    emptySupplierDetail() { // 清空
-      this.submitDisable = true
-      this.supplierValue = ''
-      this.supplierName = ''
-      this.enterpriseNature = ''
-      this.createDate = ''
-      this.registeredCapital = ''
-      this.taxNum = ''
-      this.EMail = ''
-      this.address = ''
-      this.account = ''
-      this.openingBank = ''
-      this.phone = ''
-      this.fax = ''
-      this.goodTime = ''
-    },
-    showSupplierDetail(row) { // 点击供应商表某一行
-      this.submitDisable = false
-      this.supplierValue = row.供应商流水号
-      this.supplierName = row.供应商名称
-      this.enterpriseNature = row.企业性质
-      this.createDate = row.创立日期
-      this.registeredCapital = row.注册资本
-      this.taxNum = row.税号
-      this.EMail = row.电子信箱
-      this.address = row.地址
-      this.account = row.帐号
-      this.openingBank = row.开户行
-      this.phone = row.电话号码
-      this.fax = row.传真
-      this.goodTime = row.货期
-    },
     searchTable1() {
       this.loading1 = true
       this.tableData1 = []
       this.startDate && this.endDate ? this.check1 = 1 : this.check1 = 0
       this.contractNum ? this.check2 = 1 : this.check2 = 0
-      this.buyerName ? this.check3 = 1 : this.check3 = 0
+      this.personValue ? this.check3 = 1 : this.check3 = 0
       this.supplierName ? this.check4 = 1 : this.check4 = 0
-      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startDate, this.endDate, this.check2, this.contractNum, this.check3, this.buyerName, this.check4, this.supplierName).then(response => {
+      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startDate, this.endDate, this.check2, this.contractNum, this.check3, this.personValue, this.check4, this.supplierName).then(response => {
         for (let j = 0; j < response.data.rows.length; j++) {
-          if (response.data.rows[j].规定到货时间 !== null) {
-            response.data.rows[j].规定到货时间 = response.data.rows[j].规定到货时间.substring(0, response.data.rows[j].规定到货时间.indexOf(' '))
-          }
-          if (response.data.rows[j].实际到货时间 !== null) {
-            response.data.rows[j].实际到货时间 = response.data.rows[j].实际到货时间.substring(0, response.data.rows[j].实际到货时间.indexOf(' '))
-          }
           this.tableData11[j] = []
           searchCondition(response.data.rows[j].采购合同流水号).then(response0 => {
-            this.tableData1 = response.data.rows
-            this.total1 = response.data.total
             for (let i = 0; i < response0.data.length; i++) {
-              if (response0.data[i].请款时间 !== null) {
-                response0.data[i].请款时间 = response0.data[i].请款时间.substring(0, response0.data[i].请款时间.indexOf(' '))
-              }
               this.tableData11[j].push(response0.data[i])
             }
           })
         }
+        this.tableData1 = response.data.rows
+        this.total1 = response.data.total
       }).then(() => {
         this.loading1 = false
       })
@@ -630,12 +388,6 @@ export default {
       } else { this.checkRequest = 1 }
       searchRequestTable(this.checkRequest, this.startRequestDate, this.endRequestDate).then(response => {
         for (let j = 0; j < response.data.length; j++) {
-          if (response.data[j].规定到货时间 !== null) {
-            response.data[j].规定到货时间 = response.data[j].规定到货时间.substring(0, response.data[j].规定到货时间.indexOf(' '))
-          }
-          if (response.data[j].实际到货时间 !== null) {
-            response.data[j].实际到货时间 = response.data[j].实际到货时间.substring(0, response.data[j].实际到货时间.indexOf(' '))
-          }
           if (response.data[j].请款时间 !== null) {
             response.data[j].请款时间 = response.data[j].请款时间.substring(0, response.data[j].请款时间.indexOf(' '))
           }

From 299d06af442a139c8ad508e28fa2e74913a5c02f Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Sat, 17 Nov 2018 16:42:38 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=98=BE=E7=A4=BA=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasingCenter/PurchaseContractSearch/index.vue  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index 41ae3ce3..e5a43e72 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -239,11 +239,8 @@ export default {
   created() {
     this.fetchData()
   },
-  mounted() {
-    this.useqrcode()
-  },
   methods: {
-    useqrcode() {
+    useqrcode(contractNum) {
       const opts = {
         errorCorrectionLevel: 'H',
         type: 'image/jpeg',
@@ -251,7 +248,8 @@ export default {
           quality: 0.3
         }
       }
-      QRCode.toDataURL('知道这是啥吗你就扫', opts, function(err, url) {
+      const str = 'http://192.168.1.109:8022/searchContract.html?contractNum=' + contractNum
+      QRCode.toDataURL(str, opts, function(err, url) {
         if (err) throw err
         const img = document.getElementById('img')
         img.src = url
@@ -260,7 +258,6 @@ export default {
     searchPic() {
       // 读取图片时，查找合同流水号，获取其下所有图片id，根据拼接成的路径，查询图片显示出来。
       searchFile(this.contract).then(response => {
-        console.log(response.data)
         if (response.data.length !== 0) {
           this.searchView = 'http://localhost:8022/Img/' + response.data[0].文件名
         } else {
@@ -335,6 +332,7 @@ export default {
       this.searchTable1()
     },
     searchTable2(row) {
+      this.useqrcode(row.采购合同流水号)
       this.textarea = row.合同文本
       this.supplier = row.供应商名称
       this.contract = row.采购合同编号

From 36cec28ab612e950b5b9be59f14f6a79b44269f9 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 19 Nov 2018 08:50:29 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=9A=E6=94=B9IP=EF=BC=9B=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E9=A2=84=E7=AE=97=E6=9F=A5=E8=AF=A2=EF=BC=9A=E5=8E=BB?=
 =?UTF-8?q?=E6=97=B6=E5=88=86=E7=A7=92=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=9C=AA=E8=AE=BE=E7=BD=AE=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue   | 4 ++--
 src/views/PurchasingCenter/PurchaseContractSearch/index.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue b/src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue
index f59a41b0..ef1d60c1 100644
--- a/src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue
@@ -43,7 +43,7 @@
         </el-table-column>
         <el-table-column label="预付款时间" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.预付时间 }}
+            {{ scope.row.预付时间.split(' ')[0] }}
           </template>
         </el-table-column>
         <el-table-column label="付款比例" align="center" min-width="100">
@@ -175,7 +175,7 @@
         </el-table-column>
         <el-table-column label="付款时间" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.预付时间 }}
+            {{ scope.row.预付时间 ? scope.row.预付时间.split(' ')[0] : '参考时间节点未设置' }}
           </template>
         </el-table-column>
         <el-table-column label="付款比例" align="center" min-width="100">
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index e5a43e72..2a033176 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -248,7 +248,7 @@ export default {
           quality: 0.3
         }
       }
-      const str = 'http://192.168.1.109:8022/searchContract.html?contractNum=' + contractNum
+      const str = 'http://192.168.1.111:8022/searchContract.html?contractNum=' + contractNum
       QRCode.toDataURL(str, opts, function(err, url) {
         if (err) throw err
         const img = document.getElementById('img')

From 04819196ff306563a2b5022fc6995266843ef9b3 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 19 Nov 2018 10:30:36 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E5=88=B0=E8=B4=A7=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=9A=E5=8F=AF=E8=AE=BE=E7=BD=AE=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E5=A4=A9=E6=95=B0=EF=BC=8C=E5=B7=B2=E5=88=B0=E8=B4=A7?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=A9=BA=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ArrivalStateSearch/index.vue              | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
index f2b638ac..f31b247a 100644
--- a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
+++ b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
@@ -14,6 +14,9 @@
       </el-select>
       <span>供应商:</span>
       <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
+      <span>提前</span>
+      <el-input-number v-model="warningValue" :min="1" controls-position="right" size="small" style="width: 90px"/>
+      <span>天预警</span>
       <el-button
         type="success"
         size="small"
@@ -70,7 +73,7 @@
             <el-progress
               :text-inside="true"
               :stroke-width="18"
-              :percentage="100*(parseInt(scope.row.合同物料到货总数)/parseInt(scope.row.合同物料采购总数)).toFixed(4)"
+              :percentage="parseFloat((100*scope.row.合同物料到货总数/scope.row.合同物料采购总数).toFixed(2))"
               status="success"/>
           </template>
         </el-table-column>
@@ -114,7 +117,7 @@
         </el-table-column>
         <el-table-column label="已到货数量" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.总到货数量 }}
+            {{ scope.row.总到货数量 ? scope.row.总到货数量 : 0 }}
           </template>
         </el-table-column>
       </el-table>
@@ -130,6 +133,7 @@ export default {
   name: '', // 项目总价查询
   data() {
     return {
+      warningValue: 3,
       check1: 0,
       check2: 0,
       contractNumValue: '',
@@ -169,6 +173,7 @@ export default {
       })
     },
     searchTable1() {
+      this.warningValue ? this.warningValue : this.warningValue = 1
       this.arrival = [] // 规定到货时间数组
       this.now = new Date()
       this.contractNumValue ? this.check1 = 1 : this.check1 = 0
@@ -177,13 +182,13 @@ export default {
         for (let i = 0; i < response.data.rows.length; i++) {
           this.arrival.push(new Date(response.data.rows[i].规定到货时间))
           if (parseInt(response.data.rows[i].合同物料到货总数) === parseInt(response.data.rows[i].合同物料采购总数)) {
-            this.judge[i] = 1
-          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.now - this.arrival[i]) > 0 && (this.now - this.arrival[i]) < 86400000) {
-            this.judge[i] = 2
-          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.now - this.arrival[i]) > 86400000) {
-            this.judge[i] = 3
-          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.now - this.arrival[i]) < 0) {
-            this.judge[i] = 4
+            this.judge[i] = 1 // 全部到货
+          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.arrival[i] - this.now) > 0 && (this.arrival[i] - this.now) < (86400000 * this.warningValue)) {
+            this.judge[i] = 2 // 即将拖期
+          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.arrival[i] - this.now) < 0) {
+            this.judge[i] = 3 // 已拖期
+          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.arrival[i] - this.now) > (86400000 * this.warningValue)) {
+            this.judge[i] = 4 // 进度正常
           }
         }
         this.tableData1 = response.data.rows

From be947a241c70861f52ef2c54e56e6c7b9e6f8e0c Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 19 Nov 2018 11:35:57 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=EF=BC=9A=E6=8C=89=E9=92=AE=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasingCenter/OfflineContract/index.vue     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index d4af1840..1eedaf7a 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -233,7 +233,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100">
           <template slot-scope="scope">
-            <el-button type="danger" size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
+            <el-button :disabled="disable" type="danger" size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -243,7 +243,7 @@
       <el-table
         :data="tableData4"
         :show-header="false"
-        highlight-current-row
+        :highlight-current-row="!disable"
         border
         height="280px"
         style="width: 250px;display:inline-block;max-height: 280px;"
@@ -256,7 +256,7 @@
         </el-table-column>
       </el-table>
       <el-input :rows="20" v-model="textArea" :readonly="disable" type="textarea" style="width:calc(99% - 250px);float:right;margin-bottom: 20px" resize="none"/>
-      <el-button type="success" size="mini" icon="el-icon-circle-check-outline" @click="doneOfflineContact">生成离线合同</el-button>
+      <el-button :disabled="disable" type="success" size="mini" icon="el-icon-circle-check-outline" @click="doneOfflineContact">生成离线合同</el-button>
     </el-card>
 
     <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
@@ -963,9 +963,11 @@ export default {
         }
       }
       this.paramRow = row
-      searchContractDemo(this.paramRow.合同模板流水号).then(response => {
-        this.textArea = response.data[0].合同模板内容.replace('stipulateArrivalTime', this.stipulateArrivalTime).replace('payMethodName', this.payMethodName)
-      })
+      if (!this.disable) {
+        searchContractDemo(this.paramRow.合同模板流水号).then(response => {
+          this.textArea = response.data[0].合同模板内容.replace('stipulateArrivalTime', this.stipulateArrivalTime).replace('payMethodName', this.payMethodName)
+        })
+      }
     },
     payMethodChange() { // 付款方式改变
       for (let i = 0; i < this.payMethod.length; i++) {

From 59e74eb1a123cde693c1a17d9ff79e4d344ceb99 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 19 Nov 2018 13:33:23 +0800
Subject: [PATCH 12/16] 11-19

---
 .../ManufacturingCenter/ProcessPlanning.js    |   2 +-
 src/api/PurchasingCenter/qrcodeGeneration.js  |   0
 .../ProcessPlanning/index.vue                 | 266 +++++++++++++-----
 .../ProcessTaskAssignment/index.vue           |  14 +-
 .../ProcessingStatus/index.vue                |  13 +-
 .../ProductionCapacityBalance/index.vue       |   2 +-
 .../ManufacturingCenter/StatusQuery/index.vue |  19 +-
 .../qrcodeGeneration/index.vue                |  54 ++++
 8 files changed, 292 insertions(+), 78 deletions(-)
 create mode 100644 src/api/PurchasingCenter/qrcodeGeneration.js
 create mode 100644 src/views/PurchasingCenter/qrcodeGeneration/index.vue

diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js
index 81d9727f..9fb095b0 100644
--- a/src/api/ManufacturingCenter/ProcessPlanning.js
+++ b/src/api/ManufacturingCenter/ProcessPlanning.js
@@ -174,7 +174,7 @@ export function initPerson() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=10=int'
+      param: '考核部门编号=17'
     }
   })
 }
diff --git a/src/api/PurchasingCenter/qrcodeGeneration.js b/src/api/PurchasingCenter/qrcodeGeneration.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
index bf114849..3c8d9abe 100644
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -14,7 +14,12 @@
         <el-radio :label="2">已编制</el-radio>
       </el-radio-group>
       <span>工艺员:</span>
-      <el-select v-model="CraftmenValue" placeholder="工艺员" size="small" style="width:100px" @change="clearDetail();searchParts()">
+      <el-select
+        v-model="CraftmenValue"
+        placeholder="工艺员"
+        size="small"
+        style="width:100px"
+        @change="clearDetail();searchParts()">
         <el-option
           v-for="item in Craftmen"
           :key="item.value"
@@ -22,16 +27,26 @@
           :value="item.value"/>
       </el-select>
       <span>零件号:</span>
-      <el-select v-model="partNumValue" filterable clearable placeholder="零件号" size="small" @clear="clearDetail" @change="searchParts">
+      <el-select
+        v-model="partNumValue"
+        filterable
+        clearable
+        placeholder="零件号"
+        size="small"
+        @clear="clearDetail"
+        @change="searchParts">
         <el-option
           v-for="item in partNum"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">查询</el-button>
-      <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>
-      <el-button v-show="!isShow2" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式</el-button>
+      <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">查询
+      </el-button>
+      <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整
+      </el-button>
+      <el-button v-show="!isShow2" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式
+      </el-button>
       <div v-show="isShow">
         <span>种类:</span>
         <el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px"/>
@@ -66,15 +81,26 @@
         <el-input v-model="tolerance" size="small" style="width:150px" placeholder="公差"/>
         <el-button style="margin:10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
         <el-button-group v-if="isShow1" style="margin: 10px">
-          <el-button v-if="isShow1" type="info" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存</el-button>
+          <el-button v-if="isShow1" type="info" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存
+          </el-button>
           <el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴</el-button>
-          <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">典艺</el-button>
-          <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="WYbtn">完艺</el-button>
-          <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除</el-button>
-          <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-cjn-09" @click="saveApprove">保存</el-button>
+          <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">典艺
+          </el-button>
+          <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="WYbtn">完艺
+          </el-button>
+          <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
+          </el-button>
+          <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-cjn-09" @click="saveApprove">保存
+          </el-button>
         </el-button-group>
       </el-row>
-      <el-table v-loading="loading0" :data="tableData" :row-class-name="tableRowClassName" border style="width: 100%;max-height: 550px;" size="mini" height="550px">
+      <el-table
+        v-loading="loading0"
+        :data="tableData"
+        border
+        style="width: 100%;max-height: 550px;"
+        size="mini"
+        height="550px">
         <el-table-column prop="num" label="序号" width="50" align="center" type="index"/>
         <el-table-column prop="name" label="工艺名称" width="230" align="center">
           <template slot-scope="scope">
@@ -147,7 +173,13 @@
 
     <el-dialog :visible.sync="dialogMaterial" title="材质选择" center width="400px">
       <el-input v-model="input" placeholder="材质" size="small" style="width:200px"/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>
+      <el-button
+        type="success"
+        size="small"
+        icon="el-icon-search"
+        style="margin: 0 0 10px 10px"
+        @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询
+      </el-button>
       <el-table
         :data="tableMaterial"
         size="mini"
@@ -217,7 +249,12 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="典型工艺零件分类">
-              <el-select v-model="typicalClassValue" placeholder="分类" size="small" style="width:150px" @change="classChange()">
+              <el-select
+                v-model="typicalClassValue"
+                placeholder="分类"
+                size="small"
+                style="width:150px"
+                @change="classChange()">
                 <el-option
                   v-for="item in typicalClass"
                   :key="item.value"
@@ -228,7 +265,13 @@
           </el-col>
           <el-col :span="10">
             <el-form-item label="零件名称">
-              <el-select id="name" v-model="partNameValue1" placeholder="零件名称" size="small" style="width:150px" @change="nameChange()">
+              <el-select
+                id="name"
+                v-model="partNameValue1"
+                placeholder="零件名称"
+                size="small"
+                style="width:150px"
+                @change="nameChange()">
                 <el-option
                   v-for="item in partName1"
                   :key="item.value"
@@ -244,7 +287,13 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="典型工艺号">
-              <el-select id="num" v-model="processNumValue" placeholder="工艺号" style="width:150px" size="small" @change="numChange()">
+              <el-select
+                id="num"
+                v-model="processNumValue"
+                placeholder="工艺号"
+                style="width:150px"
+                size="small"
+                @change="numChange()">
                 <el-option
                   v-for="item in partName1"
                   :key="item.value"
@@ -262,7 +311,12 @@
             <el-button size="small" @click="processCopy()">工艺拷贝</el-button>
           </el-col>
         </el-row>
-        <el-table :data="tableData2" style="width: 97%;max-height: 300px;margin-top:15px" height="300px" border size="mini">
+        <el-table
+          :data="tableData2"
+          style="width: 97%;max-height: 300px;margin-top:15px"
+          height="300px"
+          border
+          size="mini">
           <el-table-column align="center" label="工艺序号" width="80">
             <template slot-scope="scope">
               {{ scope.row.工艺序号 }}
@@ -292,7 +346,9 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="工艺员">
-              <el-input v-model="CraftmanValue" size="small" readonly style="width: 150px;" @focus="dialogFormVisible3=true"/>
+              <el-input v-model="CraftmanValue" clearable size="small" readonly style="width: 150px;">
+                <el-button slot="append" icon="el-icon-search" @click="dialogFormVisible3=true"/>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="10">
@@ -300,9 +356,7 @@
               <el-input v-model="PN" size="small" placeholder="输入零件号" style="width: 150px" @change="inputChange"/>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-button size="small" type="success" icon="el-icon-search" @click="searchProcess1()">查询</el-button>
-          </el-col>
+
         </el-row>
         <el-row>
           <el-col :span="10">
@@ -328,13 +382,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
+            <el-button size="small" type="success" icon="el-icon-search" @click="searchProcess1()">查询</el-button>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
             <el-form-item label="零件图号">
-              <el-select v-model="tuhaoValue" placeholder="零件图号" size="small" style="width:150px" @change="numChange1()">
+              <el-select
+                v-model="tuhaoValue"
+                placeholder="零件图号"
+                size="small"
+                style="width:150px"
+                @change="numChange1()">
                 <el-option
                   v-for="item in tuhao"
                   :key="item.value"
@@ -345,11 +404,19 @@
           </el-col>
           <el-col :span="10">
             <el-form-item label="零件名称">
-              <el-input v-model="remark1" size="small" style="width: 150px;"/>
+              <el-input v-model="remark1" size="small" readonly style="width: 150px;"/>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
+          </el-col>
         </el-row>
-        <el-table :data="tableData4" style="width: 97%;max-height: 250px;margin-top: 15px" size="mini" border height="250px">
+        <el-table
+          :data="tableData4"
+          style="width: 97%;max-height: 250px;margin-top: 15px"
+          size="mini"
+          border
+          height="250px">
           <el-table-column align="center" label="工艺序号" width="80">
             <template slot-scope="scope">
               {{ scope.row.工序顺序 }}
@@ -423,12 +490,46 @@
 
 <script>
 import '@/icon/iconfont.css'
-import { initCraftmen, getPartnames1, getPartnames2, detailInfo, mainTable, getMaterial, searchMaterial, typicalProcess, initTolerance, FcK,
-  searchProcess, searchWYgongyi, gongyiCopy, initPerson, gongyiYQ, hardEdit, requestEdit, processNameClick, processNameSelect,
-  processRequestSelect, searchTolerance, insertOne, deleteOne, upOne, downOne, saveMaterial, saveApprove, selectRequest,
-  pasteTable, deleteTable, returnEdit, searchRecord } from '@/api/ManufacturingCenter/ProcessPlanning'
+import {
+  initCraftmen,
+  getPartnames1,
+  getPartnames2,
+  detailInfo,
+  mainTable,
+  getMaterial,
+  searchMaterial,
+  typicalProcess,
+  initTolerance,
+  FcK,
+  searchProcess,
+  searchWYgongyi,
+  gongyiCopy,
+  initPerson,
+  gongyiYQ,
+  hardEdit,
+  requestEdit,
+  processNameClick,
+  processNameSelect,
+  processRequestSelect,
+  searchTolerance,
+  insertOne,
+  deleteOne,
+  upOne,
+  downOne,
+  saveMaterial,
+  saveApprove,
+  selectRequest,
+  pasteTable,
+  deleteTable,
+  returnEdit,
+  searchRecord
+} from '@/api/ManufacturingCenter/ProcessPlanning'
+import elInput from 'element-ui/packages/input'
 
 export default {
+  components: {
+    elInput
+  },
   data() {
     return {
       total: 0,
@@ -445,6 +546,7 @@ export default {
       CraftmenValue: '', // 工艺员值
       Craftmen: [], // 工艺员
       CraftmanValue: '', // 完艺表单工艺员值
+      CraftmanValue2: '', // 完艺表单工艺员值中间变量
       Craftman: [], // 完艺表单工艺员
       partName: '', // 零件名称
       batchNum: '', // 投产总数量
@@ -501,7 +603,8 @@ export default {
       date02: '', // 完艺结束时间
       PN: '', // 零件号
       num: '', // 工艺计划流水号
-      perNum: [],
+      perNum: '',
+      perNum2: '',
       tuhao: [],
       tuhaoValue: '',
       check1: 0,
@@ -532,15 +635,15 @@ export default {
       this.spec = ''
       this.batchNum = ''
     },
-    tableRowClassName({ row }) {
-      for (let i = 0; i < this.tableRecord.length; i++) {
-        if (this.tableRecord[i].工序流水号 === row.工序流水号 && this.radio === 2 && this.tableRecord[i].工艺编号 !== null) { //  && this.tableRecord[i].工艺难度等级 !== null && this.tableRecord[i].工艺要求 !== null
-          if (this.tableRecord[i].工艺编号 !== row.工艺编号 || this.tableRecord[i].工艺要求 !== row.工艺要求 || this.tableRecord[i].工艺难度等级 !== row.工艺难度等级 || this.tableRecord[i].工序顺序 !== row.工序顺序) {
-            return 'change'
-          }
-        }
-      }
-    },
+    // tableRowClassName({ row }) {
+    //   for (let i = 0; i < this.tableRecord.length; i++) {
+    //     if (this.tableRecord[i].工序流水号 === row.工序流水号 && this.radio === 2 && this.tableRecord[i].工艺编号 !== null) { //  && this.tableRecord[i].工艺难度等级 !== null && this.tableRecord[i].工艺要求 !== null
+    //       if (this.tableRecord[i].工艺编号 !== row.工艺编号 || this.tableRecord[i].工艺要求 !== row.工艺要求 || this.tableRecord[i].工艺难度等级 !== row.工艺难度等级 || this.tableRecord[i].工序顺序 !== row.工序顺序) {
+    //         return 'change'
+    //       }
+    //     }
+    //   }
+    // },
     returnEdit() { // 在制零件工艺修改
       if (this.partNumValue === '' || this.partNumValue === null) {
         this.$message.error('请选择零件')
@@ -555,7 +658,9 @@ export default {
               this.$message.success('打回成功')
               this.partNumValue = ''
               this.tableData = []
-            } else { this.$message.error('打回失败') }
+            } else {
+              this.$message.error('打回失败')
+            }
           })
         }).catch(() => {
           this.$message({
@@ -677,7 +782,9 @@ export default {
     switchEdit() { // 切换编辑模式
       if (this.radio === 1) {
         this.isShow = !this.isShow
-      } else { this.isShow = true }
+      } else {
+        this.isShow = true
+      }
     },
     searchDetail() { // 查主表和上面显示的信息
       if (this.partNumValue === '' || this.partNumValue === null) {
@@ -726,12 +833,19 @@ export default {
       this.tableData2 = null
     },
     WYbtn() { // 完艺按钮
-      this.tableData2 = null
+      this.tableData4 = []
       this.dialogFormVisible1 = true
     },
     selectPerson(row) { // 选择工艺员
-      this.CraftmanValue = row.姓名
-      this.perNum = row.人员编号
+      this.CraftmanValue2 = row.姓名
+      this.perNum2 = row.人员编号
+    },
+    tijiao() { // 提交完艺表单中工艺定额人员的选择
+      this.dialogFormVisible3 = false
+      this.CraftmanValue = this.CraftmanValue2
+      this.perNum = this.perNum2
+      this.remark1 = ''
+      this.tuhaoValue = ''
     },
     inputChange() { // 零件号改变
       this.remark1 = ''
@@ -777,15 +891,21 @@ export default {
     searchProcess() { // 典艺工艺查询
       if (this.typicalClassValue === '') {
         this.serialNumValue1check = false
-      } else { this.serialNumValue1check = true }
+      } else {
+        this.serialNumValue1check = true
+      }
 
       if (this.partNameValue1 === '') {
         this.partNameValue1check = false
-      } else { this.partNameValue1check = true }
+      } else {
+        this.partNameValue1check = true
+      }
 
       if (this.processNumValue === '') {
         this.processNumValuecheck = false
-      } else { this.processNumValuecheck = true }
+      } else {
+        this.processNumValuecheck = true
+      }
       this.tableData2 = []
       searchProcess(this.serialNumValue1check, this.serialNumValue1, this.partNameValue1check, this.serialNumValue2, this.processNumValuecheck, this.serialNumValue2).then(response => {
         this.tableData2 = response.data
@@ -816,16 +936,24 @@ export default {
       this.tuhao = []
       if (this.PN === '') { // 零件号
         this.check1 = 0
-      } else { this.check1 = 1 }
+      } else {
+        this.check1 = 1
+      }
       if (this.perNum === '') { // 工艺员编号
         this.check2 = 0
-      } else { this.check2 = 1 }
+      } else {
+        this.check2 = 1
+      }
       if (this.remark1 === '') { // 零件名称
         this.check4 = 0
-      } else { this.check4 = 1 }
+      } else {
+        this.check4 = 1
+      }
       if (this.date01 === '' || this.date02 === '' || this.date01 === null || this.date02 === null) { // 日期
         this.check3 = 0
-      } else { this.check3 = 1 }
+      } else {
+        this.check3 = 1
+      }
       searchWYgongyi(this.check1, this.PN, this.check2, this.perNum, this.check3, this.date01, this.date02, this.check4, this.remark1).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.tuhao.push({
@@ -847,11 +975,6 @@ export default {
         })
       }
     },
-    tijiao() { // 提交完艺表单中工艺定额人员的选择
-      this.dialogFormVisible3 = false
-      this.remark1 = ''
-      this.tuhaoValue = ''
-    },
     numChange1() { // 当完成工艺号改变时，零件名称改变，并获取工艺要求
       this.remark1 = ''
       this.tableData4 = null
@@ -953,7 +1076,9 @@ export default {
       searchTolerance(this.numVal, this.selParaValue).then(response => {
         if (response.data.length !== 0) { // 防止超出范围报错
           this.tolerance = response.data[0].公差
-        } else { this.$message.error('输入的数值不对！') }
+        } else {
+          this.$message.error('输入的数值不对！')
+        }
       })
     },
     copyAndSave() { // 复制并保存
@@ -980,7 +1105,9 @@ export default {
         this.newNum = ''
         this.$message.success('保存成功')
         this.searchParts()
-      } else { this.$message.error('请核准后保存') }
+      } else {
+        this.$message.error('请核准后保存')
+      }
     },
     insertOne(row) { // 插入行
       if (this.partNumValue === '') {
@@ -1040,7 +1167,9 @@ export default {
         saveMaterial(this.partNumValue, this.material).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('保存成功')
-          } else { this.$message.error('保存失败') }
+          } else {
+            this.$message.error('保存失败')
+          }
         })
       }
     },
@@ -1052,7 +1181,9 @@ export default {
           if (response.data[0].result === '1') {
             this.$message.success('粘贴成功')
             this.searchDetail()
-          } else { this.$message.error('粘贴失败') }
+          } else {
+            this.$message.error('粘贴失败')
+          }
         })
       }
     },
@@ -1074,7 +1205,9 @@ export default {
             if (response.data[0].result === '1') {
               this.$message.success('删除成功')
               this.searchDetail()
-            } else { this.$message.error('删除失败') }
+            } else {
+              this.$message.error('删除失败')
+            }
           })
         }).catch(() => {
           this.$message({
@@ -1089,16 +1222,19 @@ export default {
 </script>
 
 <style scoped>
-  .doing-row4{
+  .doing-row4 {
     background: #f0f9eb;
   }
-  .el-card{
+
+  .el-card {
     margin-bottom: 15px;
   }
-  .el-date-editor{
-    width:150px
+
+  .el-date-editor {
+    width: 150px
   }
-  span{
+
+  span {
     margin: 10px 0 10px 10px;
   }
 </style>
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index e56ed66b..29bc3258 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -42,6 +42,7 @@
       <el-button type="primary" size="small" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
       <el-button type="primary" size="small" icon="el-icon-cjn-09" style="" @click="save">保存</el-button>
     </el-card>
+
     <el-card>
       <el-table
         ref="multipleTable"
@@ -131,7 +132,7 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogFormVisible=false">提交</el-button>
+        <el-button type="primary" @click="tijiao()">提交</el-button>
       </div>
     </el-dialog>
   </div>
@@ -143,6 +144,8 @@ import { getProject0, getProject, getGraphNum, getGroupNum, getTable0, getGraphN
 export default {
   data() {
     return {
+      num1: '', // 工艺员中间变量
+      num2: '', // 工艺员流水号中间变量
       loading: false,
       loading0: false,
       projectNameValue: '',
@@ -323,8 +326,13 @@ export default {
       this.dialogFormVisible = true
     },
     confirmPerson(row) { // 选择一行
-      this.tableData[this.index].工艺员 = row.姓名
-      this.tableData[this.index].人员编号 = row.人员编号
+      this.num1 = row.姓名
+      this.num2 = row.人员编号
+    },
+    tijiao() {
+      this.tableData[this.index].工艺员 = this.num1
+      this.tableData[this.index].人员编号 = this.num2
+      this.dialogFormVisible = false
     },
     selectAll(rows) {
       if (this.tableData[0].工艺员 !== '') {
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index 58f6697d..33fe4419 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -40,11 +40,11 @@
         <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
         <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
         <span>进度颜色：</span>
-        <el-radio v-model="radioList" label="0" style="background-color: white">全部</el-radio>
-        <el-radio v-model="radioList" label="1" style="background-color: red">拖期</el-radio>
-        <el-radio v-model="radioList" label="2" style="background-color: yellow">即将拖期</el-radio>
-        <el-radio v-model="radioList" label="3" style="background-color: lawngreen">如期</el-radio>
-        <el-radio v-model="radioList" label="4" style="background-color: deepskyblue">工序外协</el-radio>
+        <!--<span style="background-color: white">全部</span>-->
+        <span style="background-color: red">拖期</span>
+        <span style="background-color: yellow">即将拖期</span>
+        <span style="background-color: lawngreen">如期</span>
+        <span style="background-color: deepskyblue">工序外协</span>
       </el-row>
     </el-card>
 
@@ -396,6 +396,7 @@ export default {
       this.Groups = []
       if (this.project !== '') {
         getMachines(this.project).then(response => {
+          console.log(response.data)
           for (let i = 0; i < response.data.length; i++) {
             this.Machines.push({
               label: response.data[i].机床图号,
@@ -539,7 +540,7 @@ export default {
     background-color: transparent;
     border: 0px solid white;
   }
-  .lightgreen{
+  .green{
     background-color: lightgreen;
     border: 1px solid #1f2d3d;
   }
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index f21e6f59..eaac00f1 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -136,7 +136,7 @@
               type="primary"
               class="el-icon-edit"
               @click="PlateWelding(scope.$index, scope.row, 'form1')">板焊</el-button>
-            <el-button size="mini" type="primary" @click="inBatches">分批</el-button>
+              <!--<el-button size="mini" type="primary" @click="inBatches">分批</el-button>-->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index b2ff8692..fcaa7b86 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -20,9 +20,13 @@
           :value="item.value"/>
       </el-select>
       <span>机床号:</span>
-      <el-input v-model="machineToolNumber" placeholder="机床号" size="small" clearable style="width:200px" @dblclick.native="SearchMachine" @change="empty1"/>
+      <el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1">
+        <el-button slot="append" icon="el-icon-search" @click="SearchMachine" />
+      </el-input>
       <span>组号:</span>
-      <el-input v-model="groupNumber" placeholder="组号" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
+      <el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px">
+        <el-button slot="append" icon="el-icon-search" @click="searchGroupList" />
+      </el-input>
       <span>零件号:</span>
       <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px"/>
       <br>
@@ -242,7 +246,12 @@
 
 <script>
 import { initProject, intPartState, searchTable, searchmachine, searchgroup, editData } from '@/api/ManufacturingCenter/StatusQuery'
+import elInput from 'element-ui/packages/input'
+
 export default {
+  components: {
+    elInput
+  },
   data() {
     return {
       loading0: false,
@@ -401,6 +410,12 @@ export default {
             if (response.data.result[i].机床结束时间 !== '') {
               response.data.result[i].机床结束时间 = response.data.result[i].机床结束时间.substr(0, 10)
             }
+            if (response.data.result[i].工位属性 === '请选择') {
+              response.data.result[i].工位属性 = ''
+            }
+            if (response.data.result[i].机床主管 === '请选择') {
+              response.data.result[i].机床主管 = ''
+            }
           }
           this.tableData6 = response.data.result
           this.total1 = parseInt(response.data.output[0].ItemCount)
diff --git a/src/views/PurchasingCenter/qrcodeGeneration/index.vue b/src/views/PurchasingCenter/qrcodeGeneration/index.vue
new file mode 100644
index 00000000..b26bddc2
--- /dev/null
+++ b/src/views/PurchasingCenter/qrcodeGeneration/index.vue
@@ -0,0 +1,54 @@
+<!--二维码扫描查询-->
+<template>
+  <div class="app-container">
+
+    <el-card>
+      <el-table v-loading="loading0" :data="tableData" height="650" style="width: 100%;" border>
+        <el-table-column
+          label=" "
+          align="center"
+          type="index"
+          width="50"/>
+        <el-table-column label="外协厂家名称" align="center" width="280px">
+          <template slot-scope="scope">
+            {{ scope.row.外协厂家名称 }}
+          </template>
+        </el-table-column>
+      </el-table>
+
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import { searchtable } from '@/api/Outsourcing/OutFactoryMaintenance'
+export default {
+  data() {
+    return {
+      loading0: false,
+      tableData: []
+    }
+  },
+  created() {
+    this.searchTable()
+  },
+  methods: {
+    // 查询
+    searchTable() {
+      this.loading0 = true
+      searchtable(this.pageCurrent, this.pageSize, this.num1, this.ManufacturerNumber, this.num2, this.ManufacturerName, this.num10, this.ManufacturerAbbreviation, this.num3, this.address, this.num4, this.roleName, this.num5, this.phNumber, this.num6, this.Fax, this.num7, this.Remarks, this.num8, this.category, this.num11, this.attention, this.num9, this.EquipmentCondition).then(response => {
+        this.tableData = response.data.rows
+        this.total = response.data.total
+        this.loading0 = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 15px;
+  }
+</style>

From fa32b53a6fc5d2810f193af28577c24e404fba9b Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 19 Nov 2018 14:12:27 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=EF=BC=9A=E8=AE=BE=E7=BD=AE=E5=AE=89=E5=85=A8=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/PurchasingCenter/OfflineContract.js   | 12 +++++
 .../OfflineContract/index.vue                 | 54 +++++++++++++++++--
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js
index 6d3258b1..e08a6eb5 100644
--- a/src/api/PurchasingCenter/OfflineContract.js
+++ b/src/api/PurchasingCenter/OfflineContract.js
@@ -168,3 +168,15 @@ export function searchContractDemo(num1 = null) {
     }
   })
 }
+// 设置安全库存
+export function setSafeValue(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_离线合同_物料安全库存_修改数据',
+      param: `物料流水号=${params[0]}&安全库存量=${params[1]}`
+    }
+  })
+}
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 1eedaf7a..40eac828 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -29,6 +29,7 @@
 
     <el-card>
       <el-table
+        v-loading="loading1"
         :data="tableData1"
         border
         style="width: 100%;max-height: 300px;"
@@ -69,7 +70,22 @@
         </el-table-column>
         <el-table-column label="安全库存量" min-width="200" align="center">
           <template slot-scope="scope">
-            {{ scope.row.安全库存量 }}
+            <template v-if="scope.row.changeSafeValue">
+              <el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/>
+              <el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
+            </template>
+            <span v-else>{{ scope.row.安全库存量 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="设置" min-width="100" align="center">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.changeSafeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
+            <el-button
+              v-else
+              type="primary"
+              size="mini"
+              icon="el-icon-edit"
+              @click="scope.row.changeSafeValue=!scope.row.changeSafeValue">设置</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -491,13 +507,14 @@
 
 <script>
 import { searchInventoryNum, searchOfflineContract, searchOfflineContract2, searchSupplier, initPayMethod, initPayTimeNode, addOfflineContract, editOfflineContract, deleteOfflineContract, searchMateriel,
-  addMateriel, deleteMateriel, doneOfflineContact, searchContractDemo } from '@/api/PurchasingCenter/OfflineContract'
+  addMateriel, deleteMateriel, doneOfflineContact, searchContractDemo, setSafeValue } from '@/api/PurchasingCenter/OfflineContract'
 import { mapGetters } from 'vuex'
 
 export default {
   name: '', // 离线合同
   data() {
     return {
+      loading1: false,
       title2: '',
       purchaseStateValue: 2, // 采购状态 全部
       purchaseState: [
@@ -640,12 +657,18 @@ export default {
       })
     },
     searchTable1() { // 查询物料库物料
+      this.loading1 = true
       this.materialName ? this.check1 = 1 : this.check1 = 0
       this.inventoryStateValue ? this.check2 = 1 : this.check2 = 0
       searchInventoryNum(this.pageCurrent1, this.pageSize1, this.check1, this.materialName, this.check2, this.inventoryStateValue, this.purchaseStateValue).then(response => {
-        console.log(response.data.rows)
         this.tableData1 = response.data.rows
+        this.tableData1.map(v => {
+          this.$set(v, 'changeSafeValue', false)
+          v.原安全库存量 = v.安全库存量
+          return v
+        })
         this.total1 = response.data.total
+        this.loading1 = false
       })
     },
     handleSizeChange1(val) {
@@ -663,6 +686,23 @@ export default {
         this.materielGroup.push(val[i].物料流水号)
       }
     },
+    cancelEdit(row) { // 取消设置
+      row.安全库存量 = row.原安全库存量
+      row.changeSafeValue = false
+      this.$message('取消修改')
+    },
+    confirmEdit(row) { // 确认设置
+      Number(row.安全库存量) ? row.安全库存量 = Number(row.安全库存量) : row.安全库存量 = 0
+      setSafeValue(row.物料流水号, parseInt(row.安全库存量)).then(response => {
+        if (response.data[0].result === '1') {
+          row.changeSafeValue = false
+          this.$message.success('设置成功')
+          this.searchTable1()
+        } else {
+          this.$message.error('设置失败')
+        }
+      })
+    },
     searchTable2() { // 查询离线合同列表
       this.offlineContract ? this.check3 = 1 : this.check3 = 0
       this.supplierName0 ? this.check4 = 1 : this.check4 = 0
@@ -1025,4 +1065,12 @@ export default {
   .searchForm .el-form-item{
     margin-bottom: 5px;
   }
+  .edit-input {
+    padding-right: 100px;
+  }
+  .cancel-btn {
+    position: absolute;
+    right: 15px;
+    top: 5px;
+  }
 </style>

From 257da271067db5dd8ed3bc1d5e4e76733858374a Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 19 Nov 2018 14:29:03 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=EF=BC=9A=E6=98=8E=E7=BB=86=E5=B0=8F=E8=AE=A1NaN=EF=BC=9B?=
 =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8C=E8=AF=B7=E6=AC=BE=EF=BC=9A?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AF=B7=E6=AC=BE=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PurchasingCenter/OfflineContract/index.vue          | 4 ++--
 .../PurchasingCenter/OfflineContractRequestFund/index.vue     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 40eac828..676eb163 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -244,7 +244,7 @@
         </el-table-column>
         <el-table-column label="合计" align="center" min-width="100" prop="合计">
           <template slot-scope="scope">
-            {{ parseFloat(scope.row.单价) * parseInt(scope.row.数量) }}
+            {{ parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0) }}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100">
@@ -620,7 +620,7 @@ export default {
       disable2: true,
       disable3: true,
       disable4: true,
-      disable: false // 其他的禁用
+      disable: true // 其他的禁用
     }
   },
   computed: {
diff --git a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
index f3c7c393..d61faca9 100644
--- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
@@ -95,7 +95,7 @@
               </el-table>
               <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-left: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
             </el-popover>
-            <el-button type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
+            <el-button :disabled="parseInt(scope.row.审核情况流水号)!==3&&parseInt(scope.row.审批情况流水号)!==3&&parseInt(scope.row.付款情况流水号)!==3" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
           </template>
         </el-table-column>
       </el-table>

From d4816a97bd7c33318c9622804ef67e85da02e7b1 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 19 Nov 2018 14:47:28 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=E9=A2=86=E7=94=A8=E6=A0=B8=E7=AE=97?=
 =?UTF-8?q?=EF=BC=9A=E5=8A=A0=E9=A2=86=E7=94=A8=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PurchasingCenter/ReceiveCheck/index.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/PurchasingCenter/ReceiveCheck/index.vue b/src/views/PurchasingCenter/ReceiveCheck/index.vue
index 36de8f17..ac1e1caf 100644
--- a/src/views/PurchasingCenter/ReceiveCheck/index.vue
+++ b/src/views/PurchasingCenter/ReceiveCheck/index.vue
@@ -41,9 +41,9 @@
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="数量">
+        <el-table-column align="center" label="小计(元)" prop="小计">
           <template slot-scope="scope">
-            {{ scope.row.数量 }}
+            {{ scope.row.小计 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="单价">
@@ -51,9 +51,14 @@
             {{ scope.row.单价 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="小计(元)" prop="小计">
+        <el-table-column align="center" label="领用数量">
           <template slot-scope="scope">
-            {{ scope.row.小计 }}
+            {{ scope.row.出库数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="领用时间">
+          <template slot-scope="scope">
+            {{ scope.row.出库时间 }}
           </template>
         </el-table-column>
       </el-table>

From 42159275c39f5cc97a9739161cc32765bbbfbb57 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 19 Nov 2018 17:10:21 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81input?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ManufacturingCenter/StatusQuery/index.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index db28e5b1..d82822f5 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -18,7 +18,6 @@
           :value="item.value"/>
       </el-select>
       <span>机床号:</span>
-<<<<<<< HEAD
       <el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1">
         <el-button slot="append" icon="el-icon-search" @click="SearchMachine" />
       </el-input>
@@ -26,11 +25,6 @@
       <el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px">
         <el-button slot="append" icon="el-icon-search" @click="searchGroupList" />
       </el-input>
-=======
-      <el-input v-model="machineToolNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="SearchMachine" @change="empty1"/>
-      <span>组号:</span>
-      <el-input v-model="groupNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
->>>>>>> 45d3903a226c57546658abf8697edd180bd01975
       <span>零件号:</span>
       <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px"/>
       <br>