Merge remote-tracking branch 'origin/master'

罗广辉

20 hours ago 5f694550ed7bf0f6147c66feaa4406034ae62e54

 applications/task-work-order/src/views/orderView/appConfiguration/materials/index.vue

@@ -17,11 +17,11 @@
         </el-form-item>
      </el-form>

      <div class="gd-table-toolbar">
         <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增材料</el-button>
      </div>

      <div class="gd-table-container" v-loading="loading">
         <div class="gd-table-toolbar">
            <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增材料</el-button>
         </div>

         <div class="gd-table-content gd-table-content-bg">
            <el-table class="gd-table" :data="list">
               <el-table-column label="序号" width="80">
@@ -41,7 +41,7 @@
                     {{ getDictLabel(String(row.isAllScenario), dictObj.isAllScenario) }}
                  </template>
               </el-table-column>
               <el-table-column label="操作" class-name="operation-btns" width="200">
               <el-table-column label="操作" class-name="operation-btns" width="200" fixed="right">
                  <template v-slot="{ row }">
                     <el-link type="primary" @click="openForm('view', row)">查看</el-link>
                     <el-link type="primary" @click="openForm('edit', row)">编辑</el-link>