暂时

2018-11-27 09:45:36 +08:00
parent 0113ef27db
commit 7ceb2cf1af
3 changed files with 92 additions and 22 deletions
--- 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>
-        <!--<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>
+        <span style="background-color: grey">报废</span>
      </el-row>
    </el-card>

--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -173,7 +173,7 @@
          v-loading="listLoading1"
          :data="tableData1"
          class="table"
-          border
+          borde
          style="max-height: 500px"
          height="500">
          <el-table-column label="零件图号" align="center" width="240">
--- a/src/views/MarketingCenter/DeliveryManagement/index.vue
+++ b/src/views/MarketingCenter/DeliveryManagement/index.vue
@@ -19,7 +19,7 @@
    </el-card>
    <el-card>
      <el-row>
-        <el-col :span="16"><div class="grid-content bg-purple">
+        <el-col :span="17"><div class="grid-content bg-purple">
          <el-table
            v-loading="tableData2Loading"
            id="tb"
@@ -27,7 +27,7 @@
            :data="tableData5"
            highlight-current-row
            style="width: 100%"
-            height="235"
+            height="315"
            @row-click="searchCargoBox"
          >
            <el-table-column align="center" label="发货单号" width="150">
@@ -65,6 +65,11 @@
                {{ scope.row.运输状态 }}
              </template>
            </el-table-column>
+            <el-table-column align="center" label="签收人" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.签收人 }}
+              </template>
+            </el-table-column>
            <el-table-column align="center" label="追溯码" width="150">
              <template slot-scope="scope">
                <canvas :id="canvas[scope.$index]"/>
@@ -91,19 +96,22 @@
            </el-table-column>
          </el-table>
        </div></el-col>
-        <el-col :span="8"><div class="grid-content bg-purple-light">
-          <div style="width: 550px;height:236px; border: 2px solid rgb(228, 231, 237);margin-left: 5px">
-            <!--<el-upload-->
-            <!--style="margin-left: 10px"-->
-            <!--action="https://jsonplaceholder.typicode.com/posts/"-->
-            <!--list-type="picture-card"-->
-            <!--:on-preview="handlePictureCardPreview"-->
-            <!--:on-remove="handleRemove">-->
-            <!--<i class="el-icon-plus"></i>-->
-            <!--</el-upload>-->
-            <!--<el-dialog :visible.sync="dialogVisible">-->
-            <!--<img width="100%" :src="dialogImageUrl" alt="">-->
-            <!--</el-dialog>-->
+        <el-col :span="7"><div class="grid-content bg-purple-light">
+          <div style="width: 473px;height:315px; border: 2px solid rgb(228, 231, 237);margin-left: 5px">
+            <el-upload
+              :on-preview="handlePictureCardPreview"
+              :on-remove="handleRemove"
+              :file-list="fileList"
+              :before-upload="beforeUpload"
+              :on-success="onSuccess"
+              :action="'http://192.168.1.122:8410/submit/upload2.ashx?InvoiceNum='+ invoiceNum"
+              list-type="picture-card">
+              <i class="el-icon-plus"/>
+            </el-upload>
+            <el-dialog :visible.sync="dialogVisible">
+              <img :src="dialogImageUrl" width="100%" alt="">
+            </el-dialog>
+
          </div>
        </div></el-col>
      </el-row>
@@ -510,6 +518,8 @@
 </template>

 <script>
+import request from '@/utils/request'
+// import { sleep } from '@/utils/tool'
 import elInput from 'element-ui/packages/input'
 import { submitRremove, searchCargoBoxDetailed, submitMoveInto, delCargoBox, addCargoBox, searchCargoBox, editInvoice, delInvoice, addInvoice, editAdress, addAdress, deleteAdress, citySearch, provinceSearch, addressSearch, searchParts, searchHost, searchSparePart, searchProjectName, searchPackingList, searchFile, searchInvoice } from '@/api//MarketingCenter/DeliveryManagement'
 import QRCode from 'qrcode'
@@ -522,6 +532,7 @@ export default {
      canvas: [],
      show: false,
      num: '',
+      fileList: [],
      a: 1, // 嵌套表格交换变量
      b: 1, // 嵌套表格交换变量
      flag1: '', // 发货单旗帜变量
@@ -584,6 +595,8 @@ export default {
      dialogFormVisible3: false, // 填充货箱内货物对话框显示隐藏
      dialogFormVisible4: false, // 移除货箱内货物对话框显示隐藏
      QueryDetail: '',
+      dialogImageUrl: '',
+      dialogVisible: false,
      Transport: [
        {
          value: 0,
@@ -885,6 +898,7 @@ export default {
    },
    searchCargoBox(row) {
      this.invoiceNum = row.发货单编号
+      this.getFileList()
      this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum)
    },
    addCargoBox() {
@@ -1054,7 +1068,7 @@ export default {
      // 生成的二维码内容，可以添加变量
      this.QueryDetail = this.cargoBoxValue.toString()
      var canvas = document.getElementById('canvas')
-      QRCode.toCanvas(canvas, this.QueryDetail, function(error) {
+      QRCode.toCanvas(canvas, 'http://192.168.1.132:8080/#/searchBoxDetails/index?id=' + this.QueryDetail, function(error) {
        if (error) console.error(error)
        console.log('success!')
      })
@@ -1064,11 +1078,67 @@ export default {
    },
    clear() {
      this.show = false
+    },
+    async getFileList() {
+      const { data } = await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '3',
+          name: `select * from 发货管理_附件 where 是否启用 = 1 and 发货单编号 = ${this.invoiceNum}`
+        }
+      })
+      this.fileList = data.map(item => {
+        return {
+          _id: item.附件号,
+          name: item.文件标识,
+          url: 'http://192.168.1.122:8410/webpage/img/' + item.文件标识
+        }
+      })
+    },
+    async handleRemove(file, fileList) {
+      const { data } = await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '4',
+          name: `update 发货管理_附件 set 是否启用 = 0 where 附件号 = ${file._id}`
+        }
+      })
+      if (data[0].result === '0') {
+        this.$message.error('删除失败了。')
+      }
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    beforeUpload(file) {
+      const isJPG = /^image\/.*/.test(file.type)
+      const isLt4M = file.size / 1024 / 1024 < 4
+      const isInvoiceNum = !!this.invoiceNum
+
+      if (!isInvoiceNum) {
+        this.$message.error('请先选择装箱单。。')
+      }
+
+      if (!isJPG) {
+        this.$message.error('只能上传图片。。')
+      }
+      if (!isLt4M) {
+        this.$message.error('上传头像图片大小不能超过 4MB!')
+      }
+
+      return isJPG && isLt4M && isInvoiceNum
+    },
+    onSuccess(res, file, fileList) {
+      fileList = []
+      if (res[0].result === '1') {
+        this.getFileList()
+      } else {
+        this.$message.error('上传失败')
+      }
    }
-    // clear() {
-    //   this.cargoBox = []
-    //   this.cargoBoxValue = ''
-    // }
  }
 }
 </script>