Merge branch 'hurx'

src/views/order/saleOrder/deliverDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :model-value="modelValue" title="发货" width="1200px" @update:model-value="handleDialogChange" @open="handleOpen" @close="handleClose">
+  <el-dialog :model-value="modelValue" title="发货" width="50%" @update:model-value="handleDialogChange" @open="handleOpen" @close="handleClose">
     <el-form :model="form" :rules="rules" ref="formRef" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="12">

src/views/order/saleOrder/orderAffirm.vue

@@ -33,15 +33,19 @@
 
         <el-row :gutter="20">
           <!-- 第二行 -->
-          <el-col :span="8"> </el-col>
           <el-col :span="8">
             <el-form-item label="信用额度">
               <el-input v-model="orderInfo.creditLimit" placeholder="0" disabled />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="信用额度">
+              <el-input v-model="orderInfo.temporaryQuota" placeholder="0" disabled />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="剩余额度">
-              <el-input value="0" disabled />
+              <el-input v-model="orderInfo.remainingQuota" placeholder="0" disabled />
             </el-form-item>
           </el-col>
         </el-row>