Finish Hotfix-zh-181

src/views/supply/deliver/sum_list.vue

@@ -128,10 +128,10 @@
                 {{  scope.row.orderType | orderTypeFilter  }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip>
-            </el-table-column>
             <el-table-column align="left" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip>
             </el-table-column>
+            <el-table-column align="left" label="订单日期" prop="theTime" min-width="160" show-overflow-tooltip>
+            </el-table-column>
             <el-table-column align="left" label="发货单号" prop="id" min-width="130" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />

src/views/supply/displace/components/displace_form.vue

@@ -819,7 +819,7 @@ export default {
      if ( item.status2 <= 0 ) {
           return '无货'
         }else if(item.status2 >= 1 &&  item.status2 <= 30){
-          return '紧缺'
+          return item.refundableQty
         }else if(item.status2 >=31 && item.status2 <= 1000 ){
           return '有货'
         }else{

src/views/supply/engin/components/commerce_form.vue

@@ -824,7 +824,7 @@ export default {
      if ( item.status2 <= 0 ) {
           return '无货'
         }else if(item.status2 >= 1 &&  item.status2 <= 30){
-          return '紧缺'
+          return item.refundableQty
         }else if(item.status2 >=31 && item.status2 <= 1000 ){
           return '有货'
         }else{

src/views/supply/engin/components/home_form.vue

@@ -1108,7 +1108,7 @@ export default {
      if ( item.status2 <= 0 ) {
           return '无货'
         }else if(item.status2 >= 1 &&  item.status2 <= 30){
-          return '紧缺'
+          return item.refundableQty
         }else if(item.status2 >=31 && item.status2 <= 1000 ){
           return '有货'
         }else{

src/views/supply/policy/components/retail_form.vue

@@ -1838,7 +1838,7 @@ export default {
      if ( item.status2 <= 0 ) {
           return '无货'
         }else if(item.status2 >= 1 &&  item.status2 <= 30){
-          return '紧缺'
+          return item.refundableQty
         }else if(item.status2 >=31 && item.status2 <= 1000 ){
           return '有货'
         }else{

src/views/supply/retail/components/retail_form.vue

@@ -739,7 +739,7 @@ export default {
         if ( item.status2 <= 0 ) {
           return '无货'
         }else if(item.status2 >= 1 &&  item.status2 <= 30){
-          return '紧缺'
+          return item.refundableQty
         }else if(item.status2 >=31 && item.status2 <= 1000 ){
           return '有货'
         }else{
@@ -775,10 +775,10 @@ export default {
           let saleManItem = this.mainForm.salesMan ? this.salesmanList.find(o => o.adminUserId == this.mainForm.salesMan) : '';
           let params = {
             // theTime: this.mainForm.date + ' 00:00:00',
-            // mainId: this.mainForm.type,
+            // mainId: this.mainForm.type,  
             // mainName,
             k3ServiceId: this.mainForm.salesMan,
-            k3ServiceName: saleManItem.nickName,
+            k3ServiceName: saleManItem.nickName || '',
             fileNo: this.mainForm.fileNum,
             remark: this.mainForm.remark,
             type: 1, // 1:普通零售单，2:政策零售单