14

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

@@ -351,21 +351,21 @@ const form = {
   printMatFlag: '',
   printNotCodeFlag: '',
   printAllCoverFlag: '',
-  printQty: '',
+  printQty: 0,
   printQtyUnit: '',
-  printPrice: '',
-  printMoneyTotal: '',
-  payMoney: '',
+  printPrice: 0,
+  printMoneyTotal: 0,
+  payMoney: 0,
   sendKind: '',
   sendAddress: '',
   orderMemo: '',
   orderKind: '',
   outWorkDept: '',
   outWorkFactory: '',
-  outQty: '',
-  outPrice: '',
-  outMoneyTotal: '',
-  outSendMoney: '',
+  outQty: 0,
+  outPrice: 0,
+  outMoneyTotal: 0,
+  outSendMoney: 0,
   sendDate: '',
   sendDatelong: '',
   outAddress: '',

src/views/order/orderList/orderList.vue

@@ -121,7 +121,7 @@
           fixed
           label="操作"
           align="left"
-          :width="permissionFlag2?'180px':'160px'"
+          :width="permissionFlag2?'210px':'210px'"
           class-name="small-padding fixed-width">
           <template slot-scope="{row}">
             <el-button
@@ -218,6 +218,28 @@
             </template>
           </el-table-column>
           <el-table-column
+            v-else-if="column.id === 7 || column.id === 18"
+            :prop="column.field"
+            :label="column.name"
+            :width="column.width"
+            align="center"
+            header-align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            v-else-if="column.id === 19"
+            :prop="column.field"
+            :label="column.name"
+            :width="column.width"
+            align="center"
+            header-align="center"
+            show-overflow-tooltip>
+            <template slot-scope="{row}">
+              <span v-if="row.chargeMoney != 0" :class="row.chargeMoney < 0 ? 'txtGreen': 'txtRed'" >{{row.chargeMoney}}</span>
+              <span v-else="row.chargeMoney === 0" >{{row.chargeMoney}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
               v-else-if="column.id == 14"
               :label="column.name"
               :prop="column.field"
@@ -429,10 +451,10 @@ const lifeForm = {
 
 const defaultItems = [
   {
-    name: '订单编号', id: 1, field: 'orderCode', width: '132px'
+    name: '订单编号', id: 1, field: 'orderCode', width: '120'
   },
   {
-    name: '印品名称', id: 2, field: 'orderName', width: '100px'
+    name: '印品名称', id: 2, field: 'orderName', width: '100'
   },
   {
     name: '客户名称', id: 3, field: 'clientName', width: '120'
@@ -441,16 +463,22 @@ const defaultItems = [
     name: '订单状态', id: 15, field: 'orderState', width: ''
   },
   {
-    name: '产品类型', id: 4, field: 'productName', width: '130px'
+    name: '产品类型', id: 4, field: 'productName', width: '90'
+  },
+  {
+    name: '订单数量', id: 5, field: 'printQty', width: '90'
   },
   {
-    name: '订单数量', id: 5, field: 'printQty', width: '120'
+    name: '单价', id: 6, field: 'printPrice', width: '80'
   },
   {
-    name: '单价', id: 6, field: 'printPrice', width: '100'
+    name: '订单金额', id: 7, field: 'printMoneyTotal', width: '80'
   },
   {
-    name: '订单金额', id: 7, field: 'printMoneyTotal', width: '100'
+    name: '已收金额', id: 18, field: 'payMoney', width: '80'
+  },
+  {
+    name: '欠款金额', id: 19, field: 'chargeMoney', width: '80'
   },
   {
     name: '联数', id: 8, field: 'receiptsCount', width: '100'
@@ -1075,8 +1103,6 @@ export default {
       }
       var  data = JSON.stringify(order)
       payPrintOrder(data).then(res => {
-        // console.log(res)
-        // res.data.qrCodeImageUrl
         const h = this.$createElement;
         if (res.httpCode == 200) {
           _that.orderPayVisible = false
@@ -1085,7 +1111,7 @@ export default {
           _that.$notify({
             title: '提示',
             type: 'success',
-            message: h('i', { style: 'color: teal'},'收款成功'),
+            message: h('i', { style: 'color: teal'}, '收款成功'),
             duration: 30000,
             dangerouslyUseHTMLString: true
           })
@@ -1097,26 +1123,6 @@ export default {
     },
 
     // 批量下单
-    delphiWin() {
-      // alert('delphi弹窗')
-      var _that = this
-      var userAgent = navigator.userAgent
-      // console.log(_that.item)
-      if (userAgent.indexOf('DnyERPBrowser') > 0) {
-        var data = {
-          package: 'dyMultiplePrintOrder',
-          runParam: 'Form:Show:TfrmMultiplePrintOrder@1',
-          menuName: '批量下单'
-        }
-        dyERP.sendRunForm(JSON.stringify(data))
-      } else {
-        // alert('请使用开发商提供的ERP客户端')
-        _that.$message({
-          message: '请使用开发商提供的ERP客户端',
-          type: 'warning'
-        })
-      }
-    },
 
     // 客户预存
     openClientPay() {
@@ -1264,4 +1270,27 @@ export default {
 ::v-deep .el-button + .el-button {
   margin-left: 0;
 }
+.buttonPurple{
+  color: white;
+  background-color: #c640dc;
+  border-color: #c640dc;
+}
+
+.buttonGreen{
+  color: white;
+  background-color: #42b983;
+  border-color: #42b983;
+}
+.buttonRed{
+  color: white;
+  background-color: #e53232;
+  border-color: #ee1333;
+}
+.txtGreen{
+  color: #c640dc;
+}
+
+.txtRed{
+  color: #e53232;
+}
 </style>