Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue

@@ -59,6 +59,7 @@ import { searchtable, searchtable2, edit, handlechange } from '@/api/Manufacturi
 export default {
   data() {
     return {
+      num: 0,
       arrest: [],
       all: false,
       partName: '',
@@ -114,9 +115,12 @@ export default {
         this.$message.warning('请选择零件')
       } else {
         for (let i = 0; i < this.arrest.length; i++) {
-          edit(this.arrest[i].工艺计划流水号)
-          handlechange(this.arrest[i].工序流水号, '0000')
-          if (i === this.arrest.length - 1) {
+          edit(this.arrest[i].工艺计划流水号).then(() => {
+            handlechange(this.arrest[i].工序流水号, '0000').then(response => {
+              this.num = this.num + response.data[0].result
+            })
+          })
+          if (this.num === this.arrest.length) {
             this.searchTable()
           }
         }

src/views/MarketingCenter/DeliveryManagement/index.vue

@@ -255,7 +255,7 @@
                 </el-table-column>
               </el-table>
             </el-tab-pane>
-            <el-tab-pane label="随即技术文件" name="third">
+            <el-tab-pane label="随机技术文件" name="third">
               <el-table
                 v-loading="tableData3Loading"
                 :data="tableData3"
@@ -1279,6 +1279,7 @@ export default {
       this.invoiceNum = row.发货单编号
       this.DeliveryVisiable = true
       selectDelivery(this.invoiceNum).then(response => {
+        console.log(response)
         this.table = response.data
         this.装箱单名称 = response.data[0].装箱单名称
         this.发货单号 = response.data[0].发货单号
@@ -1318,7 +1319,7 @@ export default {
       const printNode = $(htmlNode)
       body.append(printNode)
       window.print()
-      body.children().show()
+      body.children().not('script').show()
       printNode.remove()
     },
     callOffDownLoadDelivery() {

src/views/PurchasingCenter/OfflineContract/index.vue

@@ -143,7 +143,7 @@
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.离线合同状态)===1" type="warning" size="small">编辑中</el-tag>
             <el-tag v-if="Number(scope.row.离线合同状态)===2&&Number(scope.row.总采购数量)!==Number(scope.row.总到货数量)" type="primary" size="small">已采购</el-tag>
-            <el-tag v-if="Number(scope.row.总采购数量)===Number(scope.row.总到货数量)" type="success" size="small">全部到货</el-tag>
+            <el-tag v-if="Number(scope.row.总采购数量)===Number(scope.row.总到货数量)&&Number(scope.row.总采购数量)!==0" type="success" size="small">全部到货</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="离线合同编号" align="center" min-width="170">
@@ -755,6 +755,7 @@ export default {
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             this.searchTable2()
+            this.disable = true
             searchMateriel(this.offlineContractNum).then(response => {
               this.tableData3 = response.data
             })
@@ -973,7 +974,7 @@ export default {
         const printNode = $(htmlNode)
         body.append(printNode)
         window.print()
-        body.children().show()
+        body.children().not('script').show()
         printNode.remove()
       }).catch(res => {
         console.log(res)

src/views/PurchasingCenter/PurchaseContractSearch/index.vue

@@ -254,7 +254,7 @@ export default {
         const printNode = $(htmlNode)
         body.append(printNode)
         window.print()
-        body.children().show()
+        body.children().not('script').show()
         printNode.remove()
       } else {
         this.$message.error('请选择合同')