hurx před 4 týdny
rodič
revize
81e2158315

+ 5 - 0
src/views/customer/customerFile/customerInfo/index.vue

@@ -157,6 +157,11 @@
             <span>{{ scope.row.customerSalesInfoVo?.creditAmount }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="临时额度" align="center" prop="temporaryQuota" min-width="80">
+          <template #default="scope">
+            <span>{{ scope.row.customerSalesInfoVo?.temporaryQuota }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="状态" align="center" prop="status" min-width="80">
           <template #default="scope">
             <dict-tag :options="sys_check_status" :value="scope.row.status" />

+ 1 - 1
src/views/customer/customerFile/customerInfo/overview/shippingAddress.vue

@@ -7,7 +7,7 @@
             <span>收货地址信息列表</span>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Add" @click="handleAdd" v-hasPermi="['customer:shippingAddress:add']">添加地址</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['customer:shippingAddress:add']">添加地址</el-button>
           </el-col>
         </el-row>
       </template>

+ 1 - 1
src/views/order/saleOrder/deliverDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :model-value="modelValue" title="发货" width="1300px" @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">

+ 6 - 2
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>