From dfab1f48568c8c399573dcba8575fa526b31b267 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Wed, 16 Oct 2019 17:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/WorkshopProcurement/NewArrivalList.js |  4 +-
 src/utils/request.js                          |  2 +-
 .../CreatingPurchasingMaterials/index.vue     | 28 ++++++----
 .../NewArrivalList/index.vue                  | 56 +++++++++++++++----
 4 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js
index 84f3fd9b..e8cec860 100644
--- a/src/api/WorkshopProcurement/NewArrivalList.js
+++ b/src/api/WorkshopProcurement/NewArrivalList.js
@@ -37,14 +37,14 @@ export function searchMateriel(num, num1) {
   })
 }
 // 查询到货单
-export function searchArriveOrder(num, num1, num2, num3, num5, pageCurrent, pageSize) {
+export function searchArriveOrder(num, num1, num2, num3, num5, num6, num7, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_到货单查询_新',
-      param: `供应商名称_check=${num}&供应商名称=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}`,
+      param: `供应商名称_check=${num}&供应商名称=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/utils/request.js b/src/utils/request.js
index 7218f9b2..da3f9d7b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index 6b5e21ce..90899c09 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -88,11 +88,12 @@
         </el-tooltip>
       </div>
       <el-table v-loading="" :data="tableData2" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable3">
-        <el-table-column label="单号状态" align="center" width="100" fixed="left">
+        <el-table-column label="采购状态" align="center" width="100" fixed="left">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">编辑中</el-tag>
             <el-tag v-if="Number(scope.row.采购计划状态)===1" type="primary" size="mini">已保存</el-tag>
-            <el-tag v-if="Number(scope.row.采购计划状态)===2" type="success" size="mini">已导出</el-tag>
+            <el-tag v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</el-tag>
+            <el-tag v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="采购计划单号" align="center" min-width="170">
@@ -134,12 +135,12 @@
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.采购计划状态)===2" type="text" style="margin-left: 20px" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
+                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="text" style="margin-left: 20px" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.采购计划状态)===2" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
+                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
               </div>
             </el-tooltip>
           </template>
@@ -157,6 +158,13 @@
           @current-change="handleCurrentChange2"/>
       </div>
       <el-table v-loading="" :data="tableData3" border highlight-current-row stripe style="margin: 3px 0" size="mini">
+        <el-table-column label="采购状态" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</el-tag>
+            <el-tag v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</el-tag>
+            <el-tag v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="物料编码" align="center" width="200">
           <template slot-scope="scope">
             {{ scope.row.物料零件编码 }}
@@ -184,24 +192,24 @@
         </el-table-column>
         <el-table-column label="成品尺寸（长、宽、高）" align="center" min-width="250px">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.成品尺寸" size="mini" style="width:240px" @change="saveWeight(scope.$index, scope.row)"/>
+            <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.成品尺寸" size="mini" style="width:240px" @change="saveWeight(scope.$index, scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column label="单位" align="center" width="100px">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.单位" size="mini" style="width:70px" @change="saveMoney(scope.$index, scope.row)"/>
+            <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.单位" size="mini" style="width:70px" @change="saveMoney(scope.$index, scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="备注" min-width="200px">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.备注1" :disabled="disable" size="mini" style="width:180px" @change="saveRemarks(scope.$index, scope.row)"/>
+            <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.备注1" size="mini" style="width:180px" @change="saveRemarks(scope.$index, scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="200px">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="物料移出采购计划" placement="top">
               <div style="display: inline-block">
-                <el-button type="info" size="mini" icon="el-icon-right" plain @click="deleteMateriel(scope.row)">物料移出采购计划</el-button>
+                <el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="info" size="mini" icon="el-icon-right" plain @click="deleteMateriel(scope.row)">物料移出采购计划</el-button>
               </div>
             </el-tooltip>
           </template>
@@ -402,8 +410,7 @@ export default {
       Remarks: [], // 备注组
       tableData4: [], // 合同模板
       采购计划状态: '',
-      paramRow: '', // 参数row
-      disable: false // 其他的禁用
+      paramRow: '' // 参数row
     }
   },
   computed: {
@@ -601,7 +608,6 @@ export default {
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             this.searchTable2()
-            this.disable = true
             searchMateriel(this.purchasingOrderNumber).then(response => {
               this.tableData3 = response.data
             })
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index 627ed836..715dcbaf 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -16,6 +16,14 @@
           style="width:260px"
           start-placeholder="开始日期"
           end-placeholder="结束日期"/>
+        <span>关联情况:</span>
+        <el-select v-model="PickingValue" placeholder="关联情况" size="small" clearable>
+          <el-option
+            v-for="item in Picking"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
         <el-tooltip :open-delay="1200" effect="dark" content="查询到货单" placement="top">
           <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
         </el-tooltip>
@@ -26,6 +34,12 @@
       <h3>到货单</h3>
       <el-table v-loading="" :data="tableData4" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable5">
         <el-table-column width="60" align="center" type="index" label="序号"/>
+        <el-table-column label="关联情况" align="center" min-width="280">
+          <template slot-scope="scope">
+            <el-tag v-if="Number(scope.row.是否关联) === 1" type="success" size="mini">已结算</el-tag>
+            <el-tag v-else type="primary" size="mini">未结算</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="供应商" align="center" min-width="280">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -45,17 +59,17 @@
           <template slot-scope="scope">
             <el-tooltip :open-delay="1200" effect="dark" content="添加到货明细" placement="top">
               <div style="display: inline-block">
-                <el-button type="success" size="mini" icon="el-icon-circle-plus-outline" plain @click="addArrivalOrderMX(scope.row)">添加到货明细</el-button>
+                <el-button :disabled="Number(scope.row.是否关联) === 1" type="success" size="mini" icon="el-icon-circle-plus-outline" plain @click="addArrivalOrderMX(scope.row)">添加到货明细</el-button>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
-                <el-button type="text" size="mini" style="margin-left: 20px" icon="el-icon-edit-outline" @click="editArrivalOrder(scope.row)"/>
+                <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-edit-outline" @click="editArrivalOrder(scope.row)"/>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
-                <el-button type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)"/>
+                <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)"/>
               </div>
             </el-tooltip>
           </template>
@@ -114,17 +128,17 @@
           <template slot-scope="scope">
             <el-tooltip :open-delay="1200" effect="dark" content="关联备料材料" placement="top">
               <div style="display: inline-block">
-                <el-button type="warning" size="mini" icon="el-icon-circle-plus-outline" plain @click="addArrivalCL(scope.row)">关联备料材料</el-button>
+                <el-button :disabled="disable === '1'" type="warning" size="mini" icon="el-icon-circle-plus-outline" plain @click="addArrivalCL(scope.row)">关联备料材料</el-button>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
-                <el-button type="text" size="mini" style="margin-left: 20px" icon="el-icon-edit-outline" @click="editArrivalMX(scope.row)"/>
+                <el-button :disabled="disable === '1'" type="text" size="mini" style="margin-left: 20px" icon="el-icon-edit-outline" @click="editArrivalMX(scope.row)"/>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
-                <el-button type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalMX(scope.row)"/>
+                <el-button :disabled="disable === '1'" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalMX(scope.row)"/>
               </div>
             </el-tooltip>
           </template>
@@ -168,7 +182,7 @@
         </el-table-column>
         <el-table-column label="单件重量" align="center" width="150px">
           <template slot-scope="scope">
-            <el-input-number v-model="scope.row.单件重量" :step="1" :min="0" size="mini" style="width:120px" @change="save(scope.$index, scope.row)"/>
+            <el-input-number v-model="scope.row.单件重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:120px" @change="save(scope.$index, scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column label="总重量" align="center" prop="总重量">
@@ -195,7 +209,7 @@
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="取消关联" placement="top">
               <div style="display: inline-block">
-                <el-button type="primary" size="mini" plain @click="deleteMateriel(scope.row)">取消关联</el-button>
+                <el-button :disabled="disable === '1'" type="primary" size="mini" plain @click="deleteMateriel(scope.row)">取消关联</el-button>
               </div>
             </el-tooltip>
           </template>
@@ -418,6 +432,14 @@ export default {
       单价: '',
       数量: '',
       SUM: 0,
+      PickingValue: '',
+      Picking: [{
+        value: 0,
+        label: '未结算'
+      }, {
+        value: 1,
+        label: '已结算'
+      }],
       ALLMoney: '',
       材料数量: '',
       材料名称: '',
@@ -457,6 +479,7 @@ export default {
       dialogVisible2: false,
       title: '',
       title1: '',
+      disable: '',
       rules: {
         supplierNameValue: [{ required: true, message: '请选择供应商' }],
         日期: [{ required: true, message: '请选择日期' }]
@@ -566,12 +589,12 @@ export default {
       const sums = []
       columns.forEach((column, index) => {
         if (index === 3) {
-          sums[index] = '未绑定数量：'
+          sums[index] = '未绑定重量：'
           return
         } else if (index === 4) {
           sums[index] = this.未绑定数量
         } if (index === 5) {
-          sums[index] = '总重量：'
+          sums[index] = '绑定重量：'
           return
         } else if (index === 6) {
           const values = data.map(item => Number(item['总重量']))
@@ -612,9 +635,16 @@ export default {
     },
     // 查询到货单
     searchTable4() {
+      this.tableData5 = []
+      this.tableData6 = []
       this.Name ? this.check = 1 : this.check = 0
-      this.dateRange ? this.check = 1 : (this.check = 0, this.dateRange = '')
-      searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1], this.pageCurrent4, this.pageSize4).then(response => {
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
+      if (this.PickingValue === 0 || this.PickingValue === 1) {
+        this.check2 = 1
+      } else {
+        this.check2 = 0
+      }
+      searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1], this.check2, this.PickingValue, this.pageCurrent4, this.pageSize4).then(response => {
         this.tableData4 = response.data.rows
         this.total4 = response.data.total
       })
@@ -747,6 +777,8 @@ export default {
       })
     },
     searchTable5(row) {
+      this.disable = row.是否关联
+      console.log(this.disable)
       this.tableData6 = []
       this.到货单流水号 = row.到货单流水号
       this.ArrivalOrderNumber = row.到货单流水号