Merge remote-tracking branch 'origin/master'

6 months ago · be5354bafb
5 changed files with 5 additions and 5 deletions
--- a/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue
+++ b/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue
@ -114,7 +114,7 @@
            <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
            <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
          </el-table>
-          <div class="title">商品</div>
+          <div class="title">维修用料</div>
          <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
            <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
--- a/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue
+++ b/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue
@ -125,7 +125,7 @@
            <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
            <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
          </el-table>
-          <div class="title">商品</div>
+          <div class="title">维修用料</div>
          <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
            <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
--- a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue
@ -128,7 +128,7 @@
            <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
            <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
          </el-table>
-          <div class="title">商品</div>
+          <div class="title">维修用料</div>
          <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
            <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
--- a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue
@ -113,7 +113,7 @@
            <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
            <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
          </el-table>
-          <div class="title">商品</div>
+          <div class="title">维修用料</div>
          <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
            <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
--- a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue
@ -125,7 +125,7 @@
            <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
            <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
          </el-table>
-          <div class="title">商品</div>
+          <div class="title">维修用料</div>
          <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
            <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />