浏览代码

修改bug

chenrui 1 年之前
父节点
当前提交
01aeb91df3

+ 1 - 1
src/views/salesManagement/salesList/list.vue

@@ -112,7 +112,7 @@
               </template>
               </template>
               <div>
               <div>
                 <a-icon type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'20px',marginRight:'8px',display:'inlineBlock'}"/>
                 <a-icon type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'20px',marginRight:'8px',display:'inlineBlock'}"/>
-                <span>{{ record.dispatchOverDay*1>0?'未备货':record.dispatchOverDay*1>0 &&record.settleOverDay*1>0?'未备货/未收款' :record.sendOverDay*1>0?'未发货':record.settleOverDay*1>0?'未收款':'--' }}</span>
+                <span style="vertical-align:top;">{{ record.dispatchOverDay*1>0?'未备货':record.dispatchOverDay*1>0 &&record.settleOverDay*1>0?'未备货/未收款' :record.sendOverDay*1>0?'未发货':record.settleOverDay*1>0?'未收款':'--' }}</span>
               </div>
               </div>
             </a-tooltip>
             </a-tooltip>
             <span v-else>--</span>
             <span v-else>--</span>

+ 5 - 4
src/views/salesManagement/salesOrderWarehouse/printModal.vue

@@ -26,10 +26,11 @@
             <a-radio value="LESS">缺货</a-radio>
             <a-radio value="LESS">缺货</a-radio>
           </a-radio-group>
           </a-radio-group>
         </a-form-model-item>
         </a-form-model-item>
-        <a-form-model-item label="原厂编码" prop="orderBy">
-          <a-radio-group v-model="form.orderBy">
-            <a-radio value="sbd.STACK_PLACE_CODE ASC">导出</a-radio>
-            <a-radio value="sbd.STACK_PLACE_CODE DESC">不导出</a-radio>
+        <a-form-model-item label="原厂编码" prop="printType">
+          <a-radio-group
+            v-model="form.printType">
+            <a-radio value="SALES_BILL_ORIG_CODE">导出</a-radio>
+            <a-radio value="SALES_BILL_NOT_LACK_ORIG_CODE">不导出</a-radio>
           </a-radio-group>
           </a-radio-group>
         </a-form-model-item>
         </a-form-model-item>
       </a-form-model>
       </a-form-model>