Merge remote-tracking branch 'origin/feature/workRecord'

src/views/modules/workRecord/weekrecordinfoDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill" v-loading="pageloading">
     <div class="mod-__masteruserrelation}">
-    <el-form label-width="500px" label-position="left" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :disabled="pageDisabled">
+    <el-form label-width="370px" label-position="left" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :disabled="pageDisabled">
       <div v-for="(item, index) in this.dataForm.totalConfigList" :key="index">
           <div>
           <el-form-item :label="item.totalDescribe" prop="showFlag" style="font-weight:bold;">
@@ -15,7 +15,7 @@
           <div v-for="(configitem, configindex) in item.configList" :key="configindex">
             <el-col :span="colspan">
             <el-form-item v-if="item.showFlag == '1'" :label="configitem.totalName" prop="total" :label-width="configitem.totalName.length*17+'px'" style="font-weight:normal;margin-left:42px;">
-                <el-input-number v-model="configitem.total" :min="0" :max="100000000" label="数量" style="width: 10rem;" :precision="0"></el-input-number>
+                <el-input-number v-model="configitem.total" :min="0" :max="100000000" label="数量" style="width: 9rem;" :precision="0"></el-input-number>
             </el-form-item>
             </el-col>
           </div>
@@ -63,7 +63,7 @@
           :on-error="handelError"
           :on-preview="handleFileCardPreview"
           style="width:480px">
-          <el-button size="small">点击上传</el-button>
+          <el-button size="small" :disabled="isAble">点击上传</el-button>
           <div slot="tip" class="el-upload__tip">支持.word、PDF、Excel文件</div>
         </el-upload>
       </el-form-item>