计件工资界面优化

src/views/mes/unitprice/index.vue

@@ -257,7 +257,7 @@
 				<el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body v-loading="upload.loading">
       <el-upload
         ref="upload"
         :limit="1"
@@ -273,9 +273,9 @@
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
-<!--          <div class="el-upload__tip" slot="tip">-->
-<!--            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据-->
-<!--          </div>-->
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的单价信息
+          </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
           <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
         </div>
@@ -347,6 +347,7 @@ export default {
       }],
       value: '',
       upload: {
+        loading: false,
         // 是否显示弹出层（用户导入）
         open: false,
         // 弹出层标题（用户导入）
@@ -574,10 +575,14 @@ export default {
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
+      console.log(1)
       this.upload.isUploading = true;
+      console.log(this.upload.isUploading)
     },
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
+      console.log(2)
+      this.upload.loading=false;
       this.upload.open = false;
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
@@ -586,6 +591,8 @@ export default {
     },
     // 提交上传文件
     submitFileForm() {
+      console.log(3)
+      this.upload.loading=true;
       this.$refs.upload.submit();
     },
     handleSearch() {

src/views/mes/unitpriceReport/index.vue

@@ -76,11 +76,11 @@
       <el-table-column label="产线名称" align="center" width="250" prop="equipmentName" />
       <el-table-column label="操作者"  width="110" align="center" prop="nickName" />
       <el-table-column label="子工序名称" width="110" align="center" prop="childprocessName" />
-      <el-table-column label="工序单价" align="center" prop="attr1" />
-      <el-table-column label="件数" align="center" prop="totalQuantity" />
+      <el-table-column label="工序单价" width="110" align="center" prop="attr1" />
+      <el-table-column label="件数（PC）" width="100" align="center" prop="totalQuantity" />
       <el-table-column label="薪酬（元）" width="110" align="center" prop="result" />
       <el-table-column label="人数" align="center" prop="headCount" />
-      <el-table-column label="平均工资（元）" width="110" align="center" prop="avgResult" />
+<!--      <el-table-column label="平均工资（元）" width="110" align="center" prop="avgResult" />-->
       <el-table-column label="实际工资（元）" width="110" align="center" prop="realWages" />
       <el-table-column label="备注" align="center" prop="remark">
         <template slot-scope="scope">
@@ -98,7 +98,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-edit"p
             @click="handleUpdate(scope.row)"
             v-hasPermi="['unitPriceReport:report:edit']"
           >工资修改</el-button>
@@ -128,8 +128,8 @@
       <el-form ref="form" :model="form"  label-width="100px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="实际工资" prop="attr1" >
-              <el-input v-model="form.attr1" />
+            <el-form-item label="实际工资" prop="attr2" >
+              <el-input v-model="form.attr2" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -166,7 +166,7 @@
 <!--              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>-->
               <el-select
                 v-model="form.remark"
-                placeholder="工单状态"
+                placeholder="备注"
                 clearable
                 style="width: 240px"
               >
@@ -328,10 +328,10 @@ export default {
       getReport(picId).then(response => {
         this.form = response.data.MesUnitpriceReport;
         this.open = true;
-        if (response.data.attr1 === null || response.data.attr1 === undefined) {
-          this.form.attr1 = row.avgResult;
+        if (response.data.attr2 === null || response.data.attr2 === undefined) {
+          this.form.attr2 = row.result;
         } else {
-          this.form.attr1 = response.data.attr1;
+          this.form.attr2 = response.data.attr2;
         }
         this.MesUnitPriceInfo=response.data.MesUnitPriceInfo;
       });