Quellcode durchsuchen

去除资产配置禁止修改工作编码的样式

Shan9312 vor 4 Monaten
Ursprung
Commit
954397c8ed

BIN
dist-测试-现代牧业-1029.zip


BIN
dist.zip


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/index.html


+ 3 - 9
src/views/asset/basics/index.vue

@@ -1187,7 +1187,7 @@
                   ref="license"
                   v-model="createTemp.license"
                   placeholder="物联网编码"
-                  :disabled="dialogStatus == 'update' && isEditWork"
+
                 />
               </el-form-item>
             </el-col>
@@ -1199,25 +1199,19 @@
                   ref="duration"
                   v-model="createTemp.duration"
                   placeholder="标准工作时长"
-                  :disabled="dialogStatus == 'update' && isEditWork"
+
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="工作类别" prop="work">
-                <!-- <el-input
-                  ref="duration"
-                  v-model="createTemp.work"
-                  placeholder="工作类别"
-                  :disabled="dialogStatus == 'update' && isEditWork"
-                /> -->
+
                 <el-select
                   v-model="createTemp.work"
                   clearable
                   placeholder="工作类别"
                   class="filter-item"
                   style="width: 120px"
-                  :disabled="dialogStatus == 'update' && isEditWork"
                 >
                   <!-- TODO: -->
                   <el-option

+ 7 - 0
src/views/custom/custom/index.vue

@@ -308,6 +308,7 @@
                 @sort-change="tableSort2"
                 :max-height="myHeight"
               >
+                <el-table-column label="牧场" prop="pastureName" min-width="110px" align="center" />
                 <el-table-column label="序号" width="100px" align="center" type="index">
                   <template slot-scope="scope">
                     <span>{{ scope.$index + (pageNum-1) * pageSize + 1 }}</span>
@@ -349,6 +350,8 @@
                 @sort-change="tableSort2"
                 :max-height="myHeight"
               >
+               <el-table-column label="牧场" prop="pastureName" min-width="110px" align="center" />
+
                 <el-table-column label="序号" width="100px" align="center" type="index">
                   <template slot-scope="scope">
                     <span>{{ scope.$index + (pageNum-1) * pageSize + 1 }}</span>
@@ -396,6 +399,8 @@
                 @sort-change="tableSort2"
                 :max-height="myHeight"
               >
+               <el-table-column label="牧场" prop="pastureName" min-width="110px" align="center" />
+
                 <el-table-column label="序号" width="100px" align="center" type="index">
                   <template slot-scope="scope">
                     <span>{{ scope.$index + (pageNum-1) * pageSize + 1 }}</span>
@@ -434,6 +439,8 @@
                 @sort-change="tableSort2"
                 :max-height="myHeight"
               >
+               <el-table-column label="牧场" prop="pastureName" min-width="110px" align="center" />
+
                 <el-table-column label="序号" width="100px" align="center" type="index">
                   <template slot-scope="scope">
                     <span>{{ scope.$index + (pageNum-1) * pageSize + 1 }}</span>

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.