Merge remote-tracking branch 'origin/master'

src/views/modules/auditManagement/auditWorkOrder.vue

@@ -2450,7 +2450,7 @@
 }
 
 .detail-text-area {
-  min-height: 80px;
+  min-height: 60px;
   padding: 12px;
   border: 1px solid #DCDFE6;
   border-radius: 4px;

src/views/modules/supplierPerformance/myPerformanceEvaluateRequest.vue

@@ -53,15 +53,6 @@
     <!-- Evaluate Request 列表 -->
     <el-table :data="dataList" :height="requestTableHeight - 100" border highlight-current-row v-loading="loading"
               @row-click="rowClick" ref="mainTable" style="width:100%;margin-bottom:8px">
-      <el-table-column fixed="right" label="操作" width="160" header-align="center" align="center">
-        <template slot-scope="scope">
-          <template v-if="!isCompleted(scope.row)">
-            <a class="customer-a" @click.stop="openEditDialog(scope.row)">Edit</a>
-            <span style="color:#dcdfe6;margin:0 2px">|</span>
-            <a class="customer-a" @click.stop="removeRequest(scope.row)">Delete</a>
-          </template>
-        </template>
-      </el-table-column>
       <el-table-column prop="requestNo" label="请求编号" min-width="140" header-align="center" align="left" />
       <el-table-column prop="supplierNo" label="供应商编号" width="120" header-align="center" align="left" />
       <el-table-column prop="supplierName" label="供应商名称" min-width="200" header-align="center" align="left" show-overflow-tooltip />
@@ -69,6 +60,15 @@
       <el-table-column prop="status" label="状态" width="110" header-align="center" align="center" />
       <el-table-column prop="createBy" label="创建者" min-width="90" header-align="center" align="left"  />
       <el-table-column prop="createDate" label="创建时间" width="140" header-align="center" align="center" />
+      <el-table-column fixed="right" label="操作" width="160" header-align="center" align="center">
+        <template slot-scope="scope">
+          <template v-if="!isCompleted(scope.row)">
+            <a class="customer-a" @click.stop="openEditDialog(scope.row)">编辑</a>
+            <span style="color:#dcdfe6;margin:0 2px">|</span>
+            <a class="customer-a" @click.stop="removeRequest(scope.row)">删除</a>
+          </template>
+        </template>
+      </el-table-column>
     </el-table>
 
     <el-pagination style="margin-top:0" @size-change="sizeChangeHandle" @current-change="currentChangeHandle"

src/views/modules/supplierPerformance/performanceIndicatorTemplate.vue

@@ -70,7 +70,7 @@
           <el-table-column prop="criteriaDesc" label="标准描述" min-width="160" show-overflow-tooltip
                            header-align="center" align="left" />
           <el-table-column prop="score" label="分数" width="80" align="right" header-align="center" />
-          <el-table-column prop="seq" label="物料编号" width="80" align="center" header-align="center" />
+          <el-table-column prop="seq" label="序号" width="80" align="center" header-align="center" />
         </el-table>
       </el-col>
     </el-row>
@@ -154,7 +154,7 @@
                                                           :max="1000" style="width: 90px"
             /></template>
           </el-table-column>
-          <el-table-column prop="seq" label="物料编号" width="100" align="right" header-align="center">
+          <el-table-column prop="seq" label="序号" width="100" align="right" header-align="center">
             <template
               slot-scope="scope"><el-input-number v-model="scope.row.seq" :controls="false" disabled :min="1"
                                                   :max="999" style="width: 90px"