Browse Source

Merge branch 'feature/Feature-supply' into develop

莫绍宝 3 years ago
parent
commit
f0b759ac51

+ 2 - 2
src/views/supply/engin/components/commerce_form.vue

@@ -47,8 +47,8 @@
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="工程信息单号" prop="enginNum">
             <div style="display: flex;">
-              <el-input v-model="mainForm.enginNum" placeholder="请选择工程登录" disabled></el-input>
-              <el-button style="margin-left: 10px;" @click="openShareDetail">选择</el-button>
+              <el-input v-model="mainForm.enginNum" placeholder="请引用工程登录" disabled></el-input>
+              <el-button style="margin-left: 10px;" @click="openShareDetail">引用</el-button>
             </div>
           </el-form-item>
         </el-col>

+ 1 - 2
src/views/supply/engin/components/home_detail.vue

@@ -157,7 +157,6 @@
           </el-table-column>
           <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="原订单数量" prop="enginNum" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
         </el-table>
@@ -223,7 +222,7 @@
           </el-table-column>
           <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="返利" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="实际返利金额" prop="rebateAmount" min-width="110" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>

+ 2 - 2
src/views/supply/engin/components/home_form.vue

@@ -53,8 +53,8 @@
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="工程登录编号" prop="loginNum">
             <div style="display: flex;">
-              <el-input v-model="mainForm.loginNum" placeholder="请选择工程登录" disabled></el-input>
-              <el-button style="margin-left: 10px;" @click="openShareDetail">选择</el-button>
+              <el-input v-model="mainForm.loginNum" placeholder="请引用工程登录" disabled></el-input>
+              <el-button style="margin-left: 10px;" @click="openShareDetail">引用</el-button>
             </div>
           </el-form-item>
         </el-col>