11136

src/api/order/orderDetail.js

@@ -77,7 +77,7 @@ export function addAndCommitPrintOrder(data, token) {
 // 编辑印刷订单
 export function updatePrintOrder(data) {
   return request({
-    url: '/order/v1/updatePrintOrder',
+    url: '/order/updatePrintOrder',
     method: 'post',
     data: data
   })

src/api/order/tobeReviewed.js

@@ -10,7 +10,7 @@ export function getOrderList(data) {
 // 退回订单
 export function backPrintOrder(data) {
   return request({
-    url: '/order/v1/backPrintOrder',
+    url: '/order/backPrintOrder',
     method: 'post',
     params: data
   })

src/views/order/orderList/component/ordermis.vue

@@ -1,3 +1,4 @@
+
 <template>
   <div class="app-container">
     <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
@@ -7,24 +8,20 @@
         </template>
         <template v-else>
           <el-button type="primary" size="mini" @click="editOrder(1)" :disabled="clickLoading">修改保存</el-button>
-          <el-button type="green" size="mini" @click="editOrder(2)" :disabled="clickLoading">修改并提交</el-button>
         </template>
         <el-select
           size="mini"
           v-model="form.orderState"
           placeholder="请选择订单状态">
           <el-option
-            key="0"
             label="待审核"
             value="0">
           </el-option>
           <el-option
-            key="1"
             label="已审核"
             value="1">
           </el-option>
           <el-option
-            key="2"
             label="已作废"
             value="2">
           </el-option>
@@ -328,27 +325,24 @@
         </el-col>
       </el-row>
     </el-form>
+
+    <el-dialog :title="innerTitle" :append-to-body="true" :visible.sync="createInnerVisible">
+      <clientInfo v-if="innerType == 2" :is-choose="true" @chooseClient='chooseClient'></clientInfo>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import {
-  getDetailPrintOrder, getWorkProcessList,
-  getProductDetailInfo, getAddressInfo,
-  addPrintOrder, addAndCommitPrintOrder, updatePrintOrder, editAndCommitPrintOrder,
-  calcOrderSendDate, parseAddress,
-  reprintCommitOrder, reprintOrder, getClientBalanceMoneyWeb, orderFormToken
+  addPrintOrder, updatePrintOrder,
+  reprintOrder, orderFormToken,
+  getPrintOrderInfo
 } from '@/api/order/orderDetail.js'
-import basePaperInfo from '@/views/baseInfo/paper/basePaperInfo'
-import accessoriesInfo from '@/views/baseInfo/accessories/accessoriesInfo'
 import Pagination from '@/components/Pagination'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { getDictTypeInfo } from '@/api/productFile/partWorkProcessInfo'
 import Addressdny from '@/components/Dialog/Addressdny'
-import PaperQuote from '@/views/baseInfo/paperQuote/paperQuote'
 import { checkCompleteDispatchOrder } from '@/api/order/tobeReviewed'
-import SelectAccessories from '@/views/select/accessoriesInfo';
-import { getWorkProcess } from '@/api/productFile/workProcessInfo';
 import DeliveryNotice from '@/components/deliveryNotice/deliveryNotice';
 import clientInfo from '@/views/doc/client/clientList'
 
@@ -392,31 +386,10 @@ const form = {
   versionCode: ''
 }
 
-const sendAddressInfo = {
-  linkMan: '', // 联系人
-  linkPhone: '', // 联系电话
-  sendProvince: '', // 发货地址省
-  sendCity: '', // 发货地址市
-  sendDistrict: '', // 发货地址区
-  sendAddress: '', // 详细地址
-  sendKind: '', // 发货方式
-  sendRegion: '', // 发货区域
-  addressQty: '', // 发货数量
-  sendType: false
-}
-
-const packrequire = {
-  packNum: 0,
-  countNum: 0
-}
-
 export default {
   components: {
-    DeliveryNotice,
-    SelectAccessories,
-    PaperQuote,
     Addressdny,
-    Pagination, basePaperInfo, accessoriesInfo, clientInfo
+    Pagination, clientInfo
   },
   props: {
     isEdit: {
@@ -517,43 +490,6 @@ export default {
 
       name: '',
       // activeNames: ['0_1', '0_2'],
-
-      // 部件
-      partList: [],
-
-      // 付款方式
-      payType: [
-        {
-          id: 0,
-          name: '现金收款',
-          value: '0',
-          guarantee: ''
-        },
-        {
-          id: 1,
-          name: '物流代收',
-          value: '0',
-          guarantee: ''
-        },
-        {
-          id: 2,
-          name: '担保人',
-          value: '0',
-          guarantee: ''
-        },
-        {
-          id: 3,
-          name: '预存',
-          value: '0',
-          guarantee: ''
-        },
-        {
-          id: 4,
-          name: '预收款',
-          value: '0',
-          guarantee: ''
-        }
-      ],
       sums: '',
 
       // 时间选项快捷方式
@@ -577,26 +513,8 @@ export default {
         }
       },
 
-      //解析地址
-      parseAddress: '',
-
-      // 表格页码
-      listData: {
-        total: 0,
-        page: 1,
-        pageSize: 10
-      },
-      processListData: {
-        total: 0,
-        page: 1,
-        pageSize: 10
-      },
-
       addressType: 1,
-      // 发货信息
-      sendAddressList: [
-        Object.assign({}, sendAddressInfo)
-      ],
+
       // 省市区选项
       addressOption: [],
       // 发货方式
@@ -607,15 +525,6 @@ export default {
       selectedOptions: '',
       addressVisible: false,
 
-      // 面数选项
-      obvRevIdOptions: [{
-        value: 1,
-        label: '正面'
-      }, {
-        value: 2,
-        label: '反面'
-      }],
-
       /* 新建订单*/
       // 部件信息
       productInfo: [], // 产品信息
@@ -666,9 +575,7 @@ export default {
     this.orderCategory = this.$route.query.orderCategory
   },
   mounted() {
-    this.baseInfo = this.$route.params.info
     // console.log(this.$route.params.info);
-    // this.orderCategory = this.$route.params.orderCategory
     this.tempRoute = Object.assign({}, this.$route)
     this.init()
     if (this.orderCategory != 1) {
@@ -695,8 +602,8 @@ export default {
     chooseClient(data) {
       this.createInnerVisible = false
       // console.log(data);
-      this.createInfo.clientName = data.clientName
-      this.createInfo.idClient = data.id
+      this.form.clientName = data.clientName
+      this.form.idClient = data.id
     },
     chooseClientByPay(data) {
       this.createInnerVisible = false
@@ -778,137 +685,20 @@ export default {
       if (_that.idOrder <= 0) {
         return
       }
-      var dataParms = {
+      var dataParams = {
         'idOrder': _that.idOrder
       }
-      getDetailPrintOrder(dataParms).then(response => {
+      getPrintOrderInfo(dataParams).then(response => {
         // console.log('order', response)
         var data = response.data
-        if (data.originFileLink) {
-          _that.hasFile = true
-        } else {
-          _that.hasFile = false
-        }
-        _that.form = {
-          /* 订单信息*/
-          businessKind: data.businessKind,
-          fileDescription: data.fileDescription,
-          originFileLink: data.originFileLink,
-          orderState: data.orderState,
-          versionCode: _that.versionCode,
-          stateMemo: data.stateMemo,
-          orderStatePrePay: data.orderStatePrePay,
-          voidFlag: data.voidFlag,
-          orderName: data.orderName, // 订单名称
-          orderCode: data.orderCode,
-          idProduct: data.idProduct, // 产品ID
-          idClient: data.idClient, // 客户id
-          clientName: data.clientName, // 客户名称
-          productName: data.productName, // 产品类型
-          productSize: data.productSize, // 产品规格
-          orderQty: data.orderQty, // 订单印量
-          kindCount: data.kindCount, // 款数
-          printRequire: data.printRequire, // 印刷要求
-          cutKind: (data.cutKind).toString(), // 成品裁切
-          packKind: data.packKind,
-          boxRequire: data.boxRequire,
-          orderMemo: data.orderMemo, // 订单备注
-          orderType: data.orderType, // 订单类型
-          sendMemo: data.sendMemo, // 发货备注
-          deliverDate: '', // 交货日期
-          deliverTime: '', // 交货时间
-          /* 发货信息*/
-          sendAddressList: data.sendAddressList,
-          /* 价格信息*/
-          orderMoneyTotal: data.orderMoneyTotal, // 总金额
-          orderPrice: data.orderPrice, // 订单价格
-          orderMoneyPre: data.orderMoneyPre, // 订单定金
-          orderMoneyPrint: data.orderMoneyPrint, // 印工金额
-          orderMoneyProcess: data.orderMoneyProcess, // 后工金额
-          orderMoneySend: data.orderMoneySend, // 订单运费
-          payKind: data.payKind, // 付款方式
-          paperRequireFlag: data.paperRequireFlag,
-          traceFlag: data.traceFlag,
-          usePreStore: data.usePreStore,
-
-          //补印信息
-          needImageProcess: data.needImageProcess,
-          rePrintIndex: data.rePrintIndex,
-
-          // 部件信息
-          partList: [],
-          deliverInformList: data.deliverInformList
-        }
-        if (data.deliverDate) {
-          _that.form.deliverDate = data.deliverDate.slice(0, 10); // 交货日期
-          _that.form.deliverTime = data.deliverDate.slice(11, 19); // 交货日期
-        }
-        if (_that.editType == 2) {
-          _that.form.usePreStore = 0
-        }
-        if (data.packRequire) {
-          var packrequire = data.packRequire.split('+')
-          // console.log(packrequire);
-          var packrequireList = []
-          packrequire.forEach(item => {
-            var packrequireItem = {
-              packNum: item.split('*')[0],
-              countNum: item.split('*')[1]
-            }
-            packrequireList.push(packrequireItem)
-          })
-          _that.packrequireList = packrequireList
-        }
-        _that.partListNew = data.partList
-        _that.sendAddressList = data.sendAddressList;
-        (data.sendAddressList).forEach(address => {
-          var addressOption = []
-          // if (address.sendProvince) {
-          //   addressOption.push(TextToCode[address.sendProvince].code)
-          // }
-          // if (address.sendCity) {
-          //   addressOption.push(TextToCode[address.sendProvince][address.sendCity].code)
-          // }
-          // if (address.sendDistrict) {
-          //   addressOption.push(TextToCode[address.sendProvince][address.sendCity][address.sendDistrict].code)
-          // }
-          _that.addressOption.push(addressOption)
-        })
-        data.partList.forEach(item => {
-          _that.partProcessList.push(item.processList)
-        })
-        if (data.printRequire != '' && data.printRequire != null) {
-          _that.printRequireOption = data.printRequire.split(',')
-        }
-        _that.getProductInfobyEdit()
-        // 付款方式
-        if (data.payKind) {
-          var paykindString = data.payKind
-          var paykindList = paykindString.split('+');
-          paykindList.forEach(item => {
-            var itemList = item.split(':')
-            _that.payType[itemList[0]].value = itemList[2]
-            // if (itemList[0] == 2) {//by夏玉
-            //   _that.payType[itemList[0]].guarantee = itemList[3]
-            // }
-            _that.payType[itemList[0]].guarantee = itemList[3]
-          })
-        }
-
-        _that.$nextTick(() => {
-          _that.partProcessList.forEach((processList, index) => {
-            processList.forEach(process => {
-              var name = 'partProcess' + index
-              _that.$refs[name][0].toggleRowSelection(process, true)
-            })
-          })
-
-          _that.$refs.deliveryNotice.currentIdClient = data.idClient
-          _that.$refs.deliveryNotice.currentIdOrder = data.id
-          _that.$refs.deliveryNotice.openNotices()
-
-        })
 
+        // if (data.originFileLink) {
+        //   _that.hasFile = true
+        // } else {
+        //   _that.hasFile = false
+        // }
+        _that.form = data
+        _that.form.orderState = data.orderState.toString()
       }).catch(err => {
         // console.log(err)
 
@@ -968,31 +758,6 @@ export default {
       }
     },
 
-    addressDialog() {
-      const _that = this;
-      // _that.addressVisible = true
-      // _that.$nextTick(function() {
-      this.$refs.address.outerVisible = true
-      _that.$refs.address.idClient = _that.form.idClient
-      // this.$refs.address.clientName = name
-      var pageNum = 1
-      _that.$refs.address.getInfo(pageNum, '')
-      _that.$refs.address.searchVal = ''
-      // })
-    },
-    // 选择地址
-    chooseAddress(row) {
-      var sendAddressItem = Object.assign({}, sendAddressInfo)
-      sendAddressItem.sendKind = row.shipModeName
-      sendAddressItem.sendRegion = row.shipArea
-      sendAddressItem.linkMan = row.receiveMan
-      sendAddressItem.linkPhone = row.receivePhone
-      sendAddressItem.sendAddress = row.address
-      sendAddressItem.sendProvince = row.province
-      sendAddressItem.sendCity = row.city
-      sendAddressItem.sendDistrict = row.area
-    },
-
     // 下拉框可输入
     selectBlur(e, index1, index2) {
       var _that = this
@@ -1005,50 +770,6 @@ export default {
         _that.partListNew[index1].paramValueList[index2].paramValue = e.target.value
       }
     },
-
-    // 解析地址
-    parseAddressBtn() {
-      const _that = this
-      if (!_that.parseAddress) {
-        _that.$message.warning('请粘贴地址')
-        return
-      }
-      var data = {
-        'address': _that.parseAddress
-      }
-      parseAddress(data).then(response => {
-        // console.log(response)
-        var data = response.data[0]
-        var sendAddressItem = Object.assign({}, sendAddressInfo)
-        sendAddressItem.linkMan = data.name
-        if (data.mobile == null || data.mobile == '' || data.mobile == undefined) {
-          sendAddressItem.linkPhone = data.phone
-        } else {
-          sendAddressItem.linkPhone = data.mobile
-        }
-        sendAddressItem.sendProvince = data.province
-        sendAddressItem.sendCity = data.city
-        sendAddressItem.sendDistrict = data.county
-        sendAddressItem.sendAddress = data.details
-        _that.sendAddressList.push(sendAddressItem)
-        // console.log(_that.sendAddressList);
-        var addressOption = []
-
-        if (data.province) {
-          addressOption.push(TextToCode[data.province].code)
-          if (data.city) {
-            addressOption.push(TextToCode[data.province][data.city].code)
-            if (data.county) {
-              addressOption.push(TextToCode[data.province][data.city][data.county].code)
-            }
-          }
-        }
-        _that.addressOption.push(addressOption);
-
-      }).catch(err => {
-        _that.$message.error(err)
-      })
-    },
     // 保存
     save(type) {
       var _that = this
@@ -1083,160 +804,9 @@ export default {
     // 修改保存
     editOrder(type) {
       var _that = this
-      var packrequireArr = []
-
-      var sendAddressList = _that.$refs.deliveryNotice.sendAddressList
-      for (let i = 0; i < sendAddressList.length; i++) {
-        var item = sendAddressList[i]
-        if (item.edit == true) {
-          _that.$message.warning('请先保存收货信息')
-          return
-        }
-      }
-      _that.packrequireList.forEach(item => {
-        if (parseInt(item.packNum) && parseInt(item.countNum)) {
-          var packrequire = item.packNum + '*' + item.countNum
-          packrequireArr.push(packrequire)
-        }
-      })
-      _that.form.packRequire = packrequireArr.join('+')
-      // console.log(_that.form.packRequire);
-      // return;
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          if (_that.form.deliverDate === '' || _that.form.deliverDate == null) {
-            _that.$message.error('交货时间不能为空')
-            return
-          }
-          // var sendAddressList = _that.form.sendAddressList
-          // for (let i = 0; i < sendAddressList.length; i++) {
-          //   if (!sendAddressList[i].sendKind) {
-          //     _that.$message.error('请选择发货方式')
-          //     return
-          //   }
-          // }
-          // 付款方式
-          var selectionArr = []
-          for (let j = 0; j < _that.payType.length; j++) {
-            if (_that.payType[j].guarantee.indexOf('+') != -1 || _that.payType[j].guarantee.indexOf(':') != -1) {
-              _that.$message.error('付款方式输入框中不能出现符号+和:')
-              return
-            }
-            if (_that.payType[j].value > 0) {
-              if (_that.payType[j].id == 2) {
-                if (!_that.payType[j].guarantee) {
-                  _that.$message.error('担保人不能为空')
-                  return
-                }
-              }
-              var selectionString = ''
-              selectionString = _that.payType[j].id + ':' + _that.payType[j].name + ':' + _that.payType[j].value + ':' + _that.payType[j].guarantee
-              selectionArr.push(selectionString)
-            }
-          }
-          _that.form.payKind = selectionArr.join('+')
-          // console.log(_that.form.orderMoneyPre);
-          // return;
-          // if (parseInt(_that.form.orderMoneyTotal) !== parseInt(_that.sums) + parseInt(_that.form.orderMoneyPre)) {
-          //   _that.$message.error('付款方式总计金额和预收款之和不等于总金额')
-          //   return
-          // }
-          if (_that.form.usePreStore == 0) {
-            if (parseInt(_that.sums) < parseInt(_that.form.orderMoneyTotal)) {
-              _that.$message.error('付款方式总计金额不能小于总金额')
-              return
-            }
-          }
-
-          if (_that.partListNew.length <= 0) {
-            _that.$message.error('请添加部件')
-            return
-          }
-          for (var i = 0; i < _that.partListNew.length; i++) {
-            for (var j = 0; j < _that.partListNew[i].paramValueList.length; j++) {
-              var param = _that.partListNew[i].paramValueList[j]
-              if ((param.paramValue == '' || param.paramValue == null) && (param.fieldType != 6) && (param.fieldType != 7) && (param.fieldType != 3)) {
-                _that.$message.error(param.parameterName + '为必填项')
-                return
-              }
-              if (param.fieldType == 3) {
-                var reg = new RegExp('^[0-9]*$');
-                if (!reg.test(param.paramValue)) {
-                  _that.$message.error('请输入正确的' + param.parameterName)
-                  return
-                }
-              }
-              if (param.fieldType == 6) {
-                var reg = /^(\d+([.]\d+)?)\*(\d+([.]\d+)?)$/;
-                // console.log(param.fieldType,reg.test(param.paramValue));
-                if (!reg.test(param.paramValue)) {
-                  _that.$message.error('请输入正确的' + param.parameterName)
-                  return
-                }
-              }
-
-              if (param.fieldType == 7) {
-                var reg = /^(\d+([.]\d+)?)\*(\d+([.]\d+)?)\*(\d+([.]\d+)?)$/;
-                // console.log(param.fieldType,reg.test(param.paramValue));
-                if (!reg.test(param.paramValue)) {
-                  _that.$message.error('请输入正确的' + param.parameterName)
-                  return
-                }
-              }
-
-            }
-          }
-          _that.calculatePrice(2, function() {
-            // console.log('_that.jsTotalMoney', _that.jsTotalMoney)
-
-            if (_that.jsTotalMoney) {
-              if (_that.jsTotalMoney > _that.form.orderMoneyTotal || _that.form.orderMoneyTotal > _that.jsTotalMoney * 1.2) {
-                // console.log('价格不对');
-                _that.$confirm(`计算金额为${_that.jsTotalMoney}元，请确认价格是否正确 `, '提示', {
-                  confirmButtonText: '确定',
-                  cancelButtonText: '取消'
-                }).then(() => {
-                  // 总金额判断
-                  if (_that.form.orderMoneyTotal == 0) {
-                    _that.$message.warning('订单金额不能为0')
-                    return
-                  } else {
-                    if (type == 1) {
-                      _that.editBtn()
-                    } else {
-                      _that.editAndPush()
-                    }
-                  }
-                }).catch(() => {
-                  return
-                })
-              } else {
-                // 总金额判断
-                if (_that.form.orderMoneyTotal == 0) {
-                  _that.$message.warning('订单金额不能为0')
-                  return
-                } else {
-                  if (type == 1) {
-                    _that.editBtn()
-                  } else {
-                    _that.editAndPush()
-                  }
-                }
-              }
-            } else {
-              // 总金额判断
-              if (_that.form.orderMoneyTotal == 0) {
-                _that.$message.warning('订单金额不能为0')
-                return
-              } else {
-                if (type == 1) {
-                  _that.editBtn()
-                } else {
-                  _that.editAndPush()
-                }
-              }
-            }
-          })
+          _that.editBtn()
         }
       })
     },
@@ -1244,14 +814,6 @@ export default {
       var _that = this
       _that.clickLoading = true
       _that.form.id = _that.idOrder
-      _that.form.sendAddressList = _that.sendAddressList
-      _that.form.partList = _that.partListNew
-      // console.log(_that.form)
-      if (_that.form.deliverDate) {
-        var deliverDate = '';
-        deliverDate = _that.form.deliverDate.slice(0, 10) + ' ' + _that.form.deliverTime;
-        _that.form.deliverDate = deliverDate;
-      }
       var data = JSON.stringify(_that.form)
       if (_that.editType == 1) {
         updatePrintOrder(data).then(response => {
@@ -1259,236 +821,16 @@ export default {
           if (response.httpCode == 200) {
             _that.clickLoading = false
             _that.$store.dispatch('tagsView/delView', _that.tempRoute).then(() => {
-              if (_that.pageFrom == '2') {
-                _that.$router.push({ path: '/order/TobeReviewed/1' })
-              } else if (_that.pageFrom == '1') {
-                _that.$router.push({ path: '/order/tobeEditedOrder/0' })
-              } else {
-                _that.$router.push({ path: '/order/tobeEditedOrder/0' })
-              }
-            })
-          }
-        }).catch(err => {
-          _that.clickLoading = false
-          // console.log(err)
-          // _that.$message.error(err)
-        })
-      } else {
-        reprintOrder(data, _that.formToken).then(response => {
-          // console.log(response)
-          if (response.httpCode == 200) {
-            _that.clickLoading = false
-
-            _that.$store.dispatch('tagsView/delView', _that.tempRoute).then(() => {
-              if (_that.pageFrom == '2') {
-                _that.$router.push({ path: '/order/TobeReviewed/1' })
-              } else if (_that.pageFrom == '1') {
-                _that.$router.push({ path: '/order/tobeEditedOrder/0' })
-              } else {
-                _that.$router.push({ path: '/order/tobeEditedOrder/0' })
-              }
-            })
-          } else if (response.httpCode != 409) {
-            _that.getToken()
-          }
-        }).catch(err => {
-          _that.clickLoading = false
-          // console.log(err)
-          // _that.$message.error(err)
-          if (err.name != 409) {
-            _that.getToken()
-          }
-        })
-      }
-    },
-    editAndPush() {
-      var _that = this
-      _that.form.id = _that.idOrder
-      _that.form.sendAddressList = _that.sendAddressList
-      _that.form.partList = _that.partListNew
-
-      if (_that.editType == 2) {
-        _that.form.needImageProcess = 0;
-        if (_that.form.deliverDate) {
-          var deliverDate = '';
-          deliverDate = _that.form.deliverDate.slice(0, 10) + ' ' + _that.form.deliverTime;
-          _that.form.deliverDate = deliverDate;
-        }
-        var data = JSON.stringify(_that.form)
-        _that.editAndPushSure(data)
-      } else {
-        checkCompleteDispatchOrder({ idOrder: _that.idOrder }).then(res => {
-          // console.log(res)
-          if (res.data.length == 0) {
-            _that.form.needImageProcess = 0;
-            if (_that.form.deliverDate) {
-              var deliverDate = '';
-              deliverDate = _that.form.deliverDate.slice(0, 10) + ' ' + _that.form.deliverTime;
-              _that.form.deliverDate = deliverDate;
-            }
-            var data = JSON.stringify(_that.form)
-            _that.editAndPushSure(data)
-          } else {
-            _that.commitVisible = true
-            _that.commitInfo.infoList = res.data;
-          }
-        })
-      }
-
-      // var data = JSON.stringify(_that.form)
-
-      // console.log(data)
-      // return
-    },
-    commitBtn() {
-      const _that = this
-      _that.form.needImageProcess = _that.commitInfo.needImageProcess;
-      var data = JSON.stringify(_that.form)
-      _that.editAndPushSure(data)
-    },
-    editAndPushSure(data) {
-      const _that = this
-      if (!_that.hasFile) {
-        _that.$message.warning('订单文件未上传')
-      }
-      _that.clickLoading = true
-      // console.log(data)
-      if (_that.editType == 1) {
-        editAndCommitPrintOrder(data).then(response => {
-          // console.log(response)
-          if (response.httpCode == 200) {
-            _that.clickLoading = false
-            _that.$store.dispatch('tagsView/delView', _that.tempRoute).then(() => {
-              if (_that.pageFrom == '2') {
-                _that.$router.push({ path: '/order/TobeReviewed/1' })
-              } else if (_that.pageFrom == '1') {
-                _that.$router.push({ path: '/order/tobeEditedOrder/0' })
-              } else {
-                _that.$router.push({ path: '/order/tobeEditedOrder/0' })
-              }
-            })
-          }
-        }).catch(err => {
-          _that.clickLoading = false
-          // console.log(err)
-          _that.$message.error(err)
-        })
-      } else {
-        reprintCommitOrder(data, _that.formToken).then(response => {
-          // console.log(response)
-          if (response.httpCode == 200) {
-            _that.clickLoading = false
-            _that.$store.dispatch('tagsView/delView', _that.tempRoute).then(() => {
-              if (_that.form.stateMemo == '待审核') {
-                _that.$router.push({ path: '/order/TobeReviewed/1' })
-              } else {
                 _that.$router.push({ path: '/order/orderList' })
-              }
             })
-          } else if (response.httpCode != 409) {
-            _that.getToken()
           }
         }).catch(err => {
           _that.clickLoading = false
           // console.log(err)
-          _that.$message.error(err)
-          if (err.name != 409) {
-            _that.getToken()
-          }
+          // _that.$message.error(err)
         })
-      }
-    },
-    // 表格合计
-    getSummaries(param) {
-      const { columns, data } = param
-      const sums = []
-      columns.forEach((column, index) => {
-        // 如果是第一列，则最后一行展示为“总计”两个字
-        if (index === 0) {
-          sums[index] = '总计'
-          // 如果是最后一列，索引为列数-1，则显示计算总和
-        } else if (index === 1) {
-          const values = data.map(item => Number(item[column.property]))
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-          } else {
-            sums[index] = 'N/A'
-          }
-          // 如果是除了第一列和最后一列的其他列，则显示为空
-        } else {
-          sums[index] = ''
-        }
-      })
-      // console.log(sums)
-      this.sums = sums[1]
-      return sums
-    },
-
-    // handleFileChange(fileList) {
-    //   var _that = this
-    //   console.log('handleFileChange', fileList)
-    //
-    //   // setTimeout(() => {
-    //   //   _that.tableRefresh()
-    //   // }, 1000)
-    // },
-
-    // 全部折叠
-    closeAll() {
-      var partList = document.getElementsByClassName('partInfoList')[0].children
-      for (let i = 0; i < partList.length; i++) {
-        var bodyClass = partList[i].children[1].className
-        if (bodyClass != 'hideContent') {
-          partList[i].children[1].removeAttribute('class')
-          partList[i].children[1].setAttribute('class', 'hideContent')
-          partList[i].children[1].children[0].setAttribute('class', 'show')
-          partList[i].children[0].children[0].children[1].className = 'box-header-icon el-icon-caret-bottom'
-        }
-      }
-    },
-
-    // 全部展开
-    openAll() {
-      var partList = document.getElementsByClassName('partInfoList')[0].children
-      for (let i = 0; i < partList.length; i++) {
-        var bodyClass = partList[i].children[1].className
-        if (bodyClass == 'hideContent') {
-          partList[i].children[1].removeAttribute('class')
-          partList[i].children[1].setAttribute('class', 'el-card__body')
-          partList[i].children[1].children[0].removeAttribute('class')
-          partList[i].children[0].children[0].children[1].className = 'box-header-icon el-icon-caret-top'
-        }
-      }
-    },
-
-    // 展开收起
-    unfold: function(e, data, type) {
-      const dv = document.getElementById(data)
-
-      var pv = dv.parentNode
-      if (dv.className == 'show') {
-        dv.removeAttribute('class')
-        pv.className = 'el-card__body'
-        if (type == 2) {
-          e.target.className = 'box-header-icon el-icon-caret-top'
-        } else {
-          pv.parentNode.children[0].children[0].children[1].className = 'box-header-icon el-icon-caret-top'
-        }
       } else {
-        dv.setAttribute('class', 'show')
-        pv.className = 'hideContent'
-        if (type == 2) {
-          e.target.className = 'box-header-icon el-icon-caret-bottom'
-        } else {
-          pv.parentNode.children[0].children[0].children[1].className = 'box-header-icon el-icon-caret-bottom'
-        }
+        //nothing do here
       }
     },
 

src/views/order/orderList/editOrder.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import itemDetail from './component/detail1.vue'
+import itemDetail from './component/ordermis.vue'
 
 export default {
   name: 'EditOrder',

src/views/order/orderList/orderList.vue

@@ -38,8 +38,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item label="订单状态" prop="voidFlag">
-                <el-select v-model="searchForm.voidFlag" :size="sizeType" filterable placeholder="订单状态" value-key="id">
+              <el-form-item label="订单状态" prop="orderState">
+                <el-select v-model="searchForm.orderState" :size="sizeType" filterable placeholder="订单状态" value-key="id">
                   <el-option
                     label="正常"
                     value="0">
@@ -92,36 +92,34 @@
           class-name="small-padding fixed-width">
           <template slot-scope="{row}">
             <el-dropdown
+              v-if="row.orderState == 0"
               size="mini"
               @command="getUploadType1($event,row)"
               trigger="click">
               <el-button size="mini" type="info" icon="el-icon-upload"></el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="1">上传样稿文件</el-dropdown-item>
-                <el-dropdown-item command="2">上传资质文件</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-            <el-dropdown
-              v-if="row.orderState == 0 || row.orderState == 1"
-              size="mini"
-              @command="getUploadType($event,row)"
-              trigger="click">
-              <el-button size="mini" type="warning" icon="el-icon-upload"></el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="1">上传文件（云）</el-dropdown-item>
-                <!--                <el-dropdown-item command="2">传输文件</el-dropdown-item>-->
-                <el-dropdown-item command="3">关联文件</el-dropdown-item>
-                <!--                <el-dropdown-item command="4">上传资质文件</el-dropdown-item>-->
-                <!--                <el-dropdown-item command="5">上传样稿文件</el-dropdown-item>-->
+                <el-dropdown-item command="1">上传图片</el-dropdown-item>
+                <el-dropdown-item command="2">上传附件</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
             <el-button
               type="danger"
-              v-if="row.orderState == 0 || row.orderState == 1"
+              v-if="row.orderState == 0"
               size="mini"
               icon="el-icon-delete"
               @click="voidOrderbtn(row)"
               title="回收站"></el-button>
+            <el-button
+              title="编辑"
+              v-if="row.orderState == 0"
+              @click="editOrderFunc(row)"
+              type="primary"
+              icon="el-icon-edit"
+              size="mini">
+            </el-button>
+            <el-button v-if="row.orderState == 1" title="退回" size="mini" type="danger" icon = "el-icon-back" class="iconfont" @click="backOrderFunc(row)">
+            </el-button>
+
           </template>
         </el-table-column>
         <el-table-column
@@ -227,13 +225,6 @@
       <delivery-notice ref="deliveryNotice"></delivery-notice>
     </el-dialog>
     <order-step ref="orderStep"></order-step>
-    <el-drawer
-      title="订单消息"
-      :reverse="true"
-      :visible.sync="memoDrawer"
-      size="600px">
-      <order-message ref="orderMessage" @addMessageHandle="addMessageHandle"></order-message>
-    </el-drawer>
 
     <el-dialog title="作废订单" :visible.sync="voidVisible" width="500">
       <el-form label-width="80px" label-position="right">
@@ -274,240 +265,19 @@
       width="1200px">
       <order-detail ref="orderDetail"></order-detail>
     </el-dialog>
-    <el-dialog
-      title="订单收款"
-      :close-on-click-modal="false"
-      class="orderPayDialog"
-      :visible.sync='orderPayVisible'
-      width="800px">
-      <el-card>
-        <div class="infoItem">
-          <label>订单编号：</label>
-          <span>{{ orderPayInfo.orderInfo.orderCode }}</span>
-        </div>
-        <div class="infoItem">
-          <label>印品名称：</label>
-          <span>{{ orderPayInfo.orderInfo.orderName }}</span>
-        </div>
-        <div class="infoItem">
-          <label>客户名称：</label>
-          <span>{{ orderPayInfo.orderInfo.clientName }}</span>
-        </div>
-        <div class="infoItem">
-          <label>总金额：</label>
-          <span>{{ orderPayInfo.orderInfo.orderMoneyTotal }}</span>
-        </div>
-      </el-card>
-      <el-card v-show="orderPayInfo.orderReceivableList.length>0">
-        <el-table border :data="orderPayInfo.orderReceivableList" size="mini">
-          <el-table-column label="订单编号" prop="orderCode"></el-table-column>
-          <!--          <el-table-column label="应收单号" prop="financeCode"></el-table-column>-->
-          <el-table-column label="客户名称" prop="clientName"></el-table-column>
-          <el-table-column label="单据金额" prop="billMoney"></el-table-column>
-          <el-table-column label="已收金额" prop="payMoney"></el-table-column>
-          <el-table-column label="欠款" prop="chargeMoney"></el-table-column>
-          <el-table-column label="当前收款" prop="currencyValue">
-            <template slot-scope="{row}">
-              <el-input type="number" size="mini" v-model="row.currencyValue"></el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-card>
-      <el-card v-show="!orderPayInfo.orderReceivableList.length>0">
-        <el-form label-width="100px">
-          <el-form-item label="直接收款金额">
-            <el-input type="number" v-model="orderPayInfo.receivableMoney"></el-input>
-          </el-form-item>
-        </el-form>
-      </el-card>
-    </el-dialog>
-    <el-dialog title="收款单" :close-on-click-modal="false" :visible.sync="paymentBillVisible" width="1000px">
-      <el-table :data="paymentBillList" border size="mini">
-        <el-table-column label="交易编号" prop="tradeCode" width="110">
-          <template slot-scope="{row}">
-            <el-tooltip :content="row.tradeCode" placement="top-start" effect="light">
-              <span v-if="row.tradeCode">{{ plusXing(row.tradeCode, 6, 4) }}</span>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-        <el-table-column label="应收金额" prop="payableMoney" w>
-          <template slot-scope="{row}">
-            <span>{{ row.payableMoney / 100 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="收款金额" prop="paiedMoney" width="100">
-          <template slot-scope="{row}">
-            <span>{{ row.paiedMoney / 100 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="二维码地址" prop="qrCodeUrl">
-          <template slot-scope="{row}">
-            <el-link :href="row.qrCodeUrl" target="_blank">二维码地址</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column label="支付方式" prop="billStatus" width="80">
-          <template slot-scope="{row}">
-            <el-tag v-if="row.paymentChannel == 1" type="info">银联</el-tag>
-            <el-tag v-else-if="row.paymentChannel == 2" type="primary">支付宝</el-tag>
-            <el-tag v-else-if="row.paymentChannel == 4" type="success">微信</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="支付状态" prop="billStatus">
-          <template slot-scope="{row}">
-            <el-tag v-if="row.billStatus == 0" type="danger">未支付</el-tag>
-            <el-tag v-else-if="row.billStatus == 1" type="success">已支付</el-tag>
-            <el-tag v-else-if="row.billStatus == 2" type="warning">手动终止</el-tag>
-            <el-tag v-else-if="row.billStatus == 3" type="warning">超时终止</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="过期时间" prop="expireTime" width="130">
-          <template slot-scope="{row}">
-            <span v-if="row.expireTime">{{ row.expireTime | getTime }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="支付时间" prop="payTime" width="130">
-          <template slot-scope="{row}">
-            <span v-if="row.payTimeLong>0">{{ row.payTime | getTime }}</span>
-            <span v-else> </span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="160px">
-          <template slot-scope="{row}">
-            <el-button size="mini" type="danger" @click="cancelPay(row)">取消</el-button>
-            <el-button size="mini" type="warning" @click="resetPay(row)">重收</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-
-    <el-dialog title="客户预存" :visible.sync="clientPayVisible" width="500px">
-      <el-dialog :title="innerTitle" :append-to-body="true" :visible.sync="createInnerVisible">
-        <clientInfo v-if="innerType == 2" :is-choose="true" @chooseClient='chooseClientByPay'></clientInfo>
-      </el-dialog>
-      <el-form :model="clientPayInfo" ref="clientPayInfo" :rules="clientPayRules" label-width="80px"
-               label-position="right">
-        <el-form-item label="客户名称" prop="clientName">
-          <el-input
-            style="width: 300px"
-            v-model="clientPayInfo.clientName"
-            disabled
-            class="input-with-select"
-            @click.native="createInnerVisible = true;innerType = 2;innerTitle ='选择客户'"
-          >
-            <!--            <el-button-->
-            <!--            slot="append"-->
-            <!--            @click="$router.push({path:'/doc/createCustomer'})">增加</el-button>-->
-            <el-button
-              slot="append"
-              @click="createInnerVisible = true;innerType = 2;innerTitle ='选择客户'">选择
-            </el-button>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="预存金额" prop="receivableMoney">
-          <el-input type="number" v-model="clientPayInfo.receivableMoney" style="width: 300px">
-          </el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="clientPayVisible = false">取 消</el-button>
-        <el-button type="primary" @click="clientPayBtn">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog title="生命周期" :close-on-click-modal="false" :visible.sync="lifeCycleVisible" width="1200px" top="100px">
-      <el-dialog title="添加生命周期" :close-on-click-modal="false" append-to-body :visible.sync="innerLifeCycleVisible">
-        <el-form label-width="175px">
-          <el-form-item label="lifeNodeId">
-            <el-select
-              v-model="lifeForm.lifeNodeId"
-              filterable
-              @input.native="selectBlur($event)">
-              <el-option
-                v-for=" item in lifeNodeOptions"
-                :key="item.id"
-                :label="item.label"
-                :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="lifeNodeName">
-            <el-input v-model="lifeForm.lifeNodeName"></el-input>
-          </el-form-item>
-          <el-form-item label="referenceMasterId">
-            <el-input v-model="lifeForm.referenceMasterId"></el-input>
-          </el-form-item>
-          <el-form-item label="referenceMasterCode">
-            <el-input v-model="lifeForm.referenceMasterCode"></el-input>
-          </el-form-item>
-          <el-form-item label="referenceSlaveId">
-            <el-input v-model="lifeForm.referenceSlaveId"></el-input>
-          </el-form-item>
-          <el-form-item label="referenceSlaveCode">
-            <el-input v-model="lifeForm.referenceSlaveCode"></el-input>
-          </el-form-item>
-          <el-form-item label="referenceMasterContent">
-            <el-input v-model="lifeForm.referenceMasterContent"></el-input>
-          </el-form-item>
-          <el-form-item label="createManName">
-            <el-input v-model="lifeForm.createManName"></el-input>
-          </el-form-item>
-          <el-form-item label="updateManName">
-            <el-input v-model="lifeForm.updateManName"></el-input>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="innerLifeCycleVisible = false">取 消</el-button>
-          <el-button type="primary" @click="addLifeCycleSure">确 定</el-button>
-        </div>
-      </el-dialog>
-      <el-button type="green" @click="addLifeCycle" size="mini" style="margin-bottom: 10px">添加</el-button>
-      <el-table
-        border
-        size="mini"
-        :data="lifeCycleList">
-        <el-table-column label="操作">
-          <template slot-scope="{row}">
-            <el-button
-              v-if="row.lifeNodeId != 0 && row.lifeNodeState == 0"
-              size="mini"
-              type="success"
-              @click="cancelLifeCycle(row,1)">启用
-            </el-button>
-            <el-button
-              v-if="row.lifeNodeId != 0 && row.lifeNodeState == 1"
-              size="mini"
-              type="danger"
-              @click="cancelLifeCycle(row,0)">作废
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column prop="lifeNodeId" label="lifeNodeId" width="100"></el-table-column>
-        <el-table-column prop="lifeNodeName" label="lifeNodeName"></el-table-column>
-        <el-table-column prop="lifeNodeState" label="lifeNodeState"></el-table-column>
-        <el-table-column prop="referenceMasterId" label="referenceMasterId"></el-table-column>
-        <el-table-column prop="referenceMasterCode" label="referenceMasterCode"></el-table-column>
-        <el-table-column prop="referenceSlaveId" label="referenceSlaveId"></el-table-column>
-        <el-table-column prop="referenceSlaveCode" label="referenceSlaveCode"></el-table-column>
-        <el-table-column prop="createManName" label="createManName"></el-table-column>
-      </el-table>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import {
-  cancelOrderPayRequest, clientPayRequest,
-  getOrderCycleDataList,
+  clientPayRequest,
   getOrderList,
-  getOrderReceivableByOrder,
-  getPaymentBillByOrder,
-  getshipAreaListInfo,
   ifPermission,
-  orderPayRequest,
-  orderPayRequest3,
-  reOrderPayRequest,
   voidPrintOrder,
-  writeOrderLifeCycle
 } from '@/api/order/orderList.js'
+import {
+  backPrintOrder
+} from '@/api/order/tobeReviewed'
 import Cancledialog from '@/components/Dialog/Cancledialog.vue'
 import productInfo from '@/views/productFile/product/productInfo'
 import clientInfo from '@/views/doc/client/clientList'
@@ -519,24 +289,9 @@ import {regionData} from 'element-china-area-data'
 import OrderDetail from '@/components/orderDetail/orderDetail'
 import {getConfigInfo} from '@/api/system/config'
 import OrderStep from '@/components/orderStep/orderStep'
-import {getLogisticsInfoList} from '@/api/order/orderDetail'
 import DeliveryNotice from '@/components/deliveryNotice/deliveryNotice'
-import CreateOrderDialog from "@/components/createOrderDialog/createOrderDialog";
-import MaterialDetail from "@/components/materialDetail/materialDetail";
-import new_badge from '@/assets/new_badge.gif'
-import ComplaintRegistration from "@/components/complaintRegistration/complaintRegistration";
-import complaintRegister from "@/views/complaint/complaintRegister";
-import TracePic from '@/views/order/orderList/component/TracePic.vue'
+import new_badge from '@/assets/new_badge.gif';
 
-const createInfo = {
-  idProduct: '',
-  productName: '',
-  clientName: '',
-  idClient: '',
-  orderName: '',
-  orderType: 0,
-  businessKind: 0
-}
 const searchForm = {
   orderCode: '',
   printBillCode: '',
@@ -642,9 +397,6 @@ var columnStorage = {
 export default {
   name: 'orderList',
   components: {
-    ComplaintRegistration,
-    MaterialDetail,
-    CreateOrderDialog,
     DeliveryNotice,
     OrderStep,
     OrderDetail,
@@ -654,8 +406,7 @@ export default {
     productInfo,
     clientInfo,
     plupload,
-    Addressdny,
-    TracePic
+    Addressdny
   },
   beforeRouteEnter(to, from, next) {
     // next()
@@ -789,90 +540,7 @@ export default {
         clientName: ''
       },
 
-      // 生命周期
-      lifeCycleVisible: false,
-      lifeCycleList: [],
-      innerLifeCycleVisible: false,
-      lifeForm: Object.assign({}, lifeForm),
       idOrderIndex: 0,
-      lifeNodeOptions: [
-        {
-          id: 0,
-          label: '制单'
-        },
-        {
-          id: 1,
-          label: '审核'
-        },
-        {
-          id: 2,
-          label: '修图'
-        },
-        {
-          id: 3,
-          label: '组版'
-        },
-        {
-          id: 4,
-          label: '施工单下达'
-        },
-        {
-          id: 5,
-          label: '排产'
-        },
-        {
-          id: 6,
-          label: '拼版'
-        },
-        {
-          id: 7,
-          label: '制版'
-        },
-        {
-          id: 8,
-          label: '白料裁切'
-        },
-        {
-          id: 9,
-          label: '印刷'
-        },
-        {
-          id: 10,
-          label: '半成品'
-        },
-        {
-          id: 11,
-          label: '外协单开制'
-        },
-        {
-          id: 12,
-          label: '外协完成'
-        },
-        {
-          id: 13,
-          label: '入库'
-        },
-        {
-          id: 14,
-          label: '发货'
-        },
-        {
-          id: 15,
-          label: '收款'
-        },
-        {
-          id: 16,
-          label: '打包'
-        },
-        {
-          id: 17,
-          label: '文件锁定'
-        },
-        {
-          id: 18,
-          label: '确认'
-        }
-      ],
       configValue1: '',
       configValue2: '',
       configValue3: '',
@@ -1044,17 +712,55 @@ export default {
           editType:0
         },
         query: {
-          orderCategory: 1
+          orderCategory: 1,
+          editType: 0
         }
       })
-      //
-      // _that.$router.push({
-      //   path: '/order/createOrder/',
-      //   params: {
-      //     id: Date.parse(new Date()),
-      //     orderCategory: 1
-      //   }
-      // })
+    },
+    editOrderFunc(row) {
+      var _that = this
+      _that.$router.push({
+        // name: 'CreateOrder',
+        path: '/order/editOrder/' + row.id,
+        query: {
+          id: row.id,
+          orderCode: row.orderCode,
+          orderCategory: 2,
+          editType:1
+        }
+      })
+    },
+    backOrderFunc(row) {
+      const _that = this
+      _that.$confirm('确认订单退回到待审核？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      }).then(() => {
+        var order = {
+          'id': row.id,
+          'orderState' : 0
+        }
+        var data = {
+          'order': JSON.stringify(order)
+        }
+
+        backPrintOrder(data).then(res => {
+          // console.log(res);
+          if (res.httpCode == 200) {
+            _that.$message({
+              message: '退回成功',
+              type: 'success'
+            })
+            _that.getList()
+          } else {
+            _that.$message.error(res.msg)
+          }
+        }).catch(err => {
+          _that.$message.error(err)
+        })
+      }).catch(() => {
+
+      })
     },
     openDetail(row) {
       var _that = this
@@ -1168,13 +874,15 @@ export default {
     },
     voidOrder() {
       var _that = this
-      var data = {
+      var order = {
         'id': _that.voidId,
         'sMemo': _that.sMemo,
         'versionCode': _that.versionCode
       }
-      // console.log(data)
-      // return
+      var data = {
+        'order': JSON.stringify(order)
+      }
+
       voidPrintOrder(data).then(response => {
         // console.log(response)
         if (response.httpCode == 200) {
@@ -1188,35 +896,6 @@ export default {
         _that.$message.error(err)
       })
     },
-
-    // 订单消息
-    openMessage(row) {
-      var _that = this
-      _that.memoDrawer = true
-      _that.$nextTick(function () {
-        // console.log(_that.$refs.orderMemo);
-        _that.$refs.orderMessage.idOrder = row.id
-        _that.$refs.orderMessage.getList()
-      })
-    },
-    traceClick(row){
-      const _that = this
-      _that.$nextTick(function () {
-        // console.log(_that.$refs.orderMemo);
-        _that.$refs.tracePic.dialogTableVisible = true;
-        _that.$refs.tracePic.idOrder = row.id
-        _that.$refs.tracePic.getOrderTraceImage()
-      })
-    },
-    addMessageHandle(data) {
-      const _that = this
-      _that.tableData.forEach(item => {
-        if (item.id == data.idBill) {
-          item.orderMessage = data.messageStr
-        }
-      })
-    },
-
     // 自定义列
     diyColumn() {
       var _that = this
@@ -1331,61 +1010,6 @@ export default {
           })
         }
       })
-    },
-
-    // 维护生命周期
-    maintainLifeCycle(id) {
-      const _that = this
-      _that.lifeCycleVisible = true
-      _that.idOrderIndex = id
-      var data = {
-        idOrder: id
-      }
-      getOrderCycleDataList(data).then(res => {
-        // console.log(res)
-        _that.lifeCycleList = res.data
-      })
-    },
-    cancelLifeCycle(row, state) {
-      const _that = this
-      row.lifeNodeState = state
-      var data = {
-        cycle: row
-      }
-      writeOrderLifeCycle(data).then(res => {
-        // console.log(res);
-        if (res.httpCode == 200) {
-          _that.$message.success('操作成功')
-          _that.maintainLifeCycle(_that.idOrderIndex)
-        }
-      })
-    },
-    selectBlur(e) {
-      // console.log('触发事件', e)
-      var _that = this
-      if (e.target != undefined) {
-        _that.lifeForm.lifeNodeId = e.target.value
-      }
-    },
-    addLifeCycle() {
-      const _that = this
-      _that.lifeForm = Object.assign({}, lifeForm)
-      _that.lifeForm.idOrder = _that.idOrderIndex
-      _that.innerLifeCycleVisible = true
-    },
-    addLifeCycleSure() {
-      const _that = this
-      var data = {
-        cycle: _that.lifeForm
-      }
-      writeOrderLifeCycle(data).then(res => {
-        // console.log(res);
-        if (res.httpCode == 200) {
-          _that.$message.success('添加成功')
-          _that.innerLifeCycleVisible = false
-          _that.maintainLifeCycle(_that.idOrderIndex)
-        }
-      })
     }
   }
 }