first

src/views/energy/electricity/dosage/index.vue

@@ -10,7 +10,7 @@
             class="w-180px mr-10px"
             @update:value="changeDate"
           ></n-date-picker>
-          <n-select v-model:value="type" :options="typeList" class="w-180px" placeholder="请选择类型"></n-select>
+<!--          <n-select v-model:value="type" :options="typeList" class="w-180px" placeholder="请选择类型"></n-select>-->
           <n-button type="primary" size="small" class="ml-15px" @click="contentReduce(-50)">内容缩小</n-button>
           <n-button type="primary" size="small" class="ml-15px" @click="contentReduce(50)">内容放大</n-button>
         </div>

src/views/energy/energyDevice/index.vue

@@ -73,35 +73,35 @@
 							<n-form-item-grid-item label="安装日期">
 								<n-date-picker v-model:value="addForm.installationDate" type="datetime" class="w-full"></n-date-picker>
 							</n-form-item-grid-item>
-              <n-form-item-grid-item label="安装位置" path="locationId">
+							<!--              <n-form-item-grid-item label="安装位置" path="locationId">-->
-                <n-select
+							<!--                <n-select-->
-                  v-model:value="addForm.locationId"
+							<!--                  v-model:value="addForm.locationId"-->
-                  :options="locationList"
+							<!--                  :options="locationList"-->
-                  class="w-full"
+							<!--                  class="w-full"-->
-                  placeholder="请选择安装位置"
+							<!--                  placeholder="请选择安装位置"-->
-                  @update-value="(val,item : any) => {
+							<!--                  @update-value="(val,item : any) => {-->
-										addForm.location = item.label;
+							<!--										addForm.location = item.label;-->
-								}"
+							<!--								}"-->
-                ></n-select>
+							<!--                ></n-select>-->
-              </n-form-item-grid-item>
+							<!--              </n-form-item-grid-item>-->
-              <n-form-item-grid-item label="是否总表" path="isMain">
+							<!--              <n-form-item-grid-item label="是否总表" path="isMain">-->
-                <n-select
+							<!--                <n-select-->
-                  v-model:value="addForm.isMain"
+							<!--                  v-model:value="addForm.isMain"-->
-                  :options="isGeneralTableList"
+							<!--                  :options="isGeneralTableList"-->
-                  class="w-full"
+							<!--                  class="w-full"-->
-                  placeholder="请选择是或否"
+							<!--                  placeholder="请选择是或否"-->
-                ></n-select>
+							<!--                ></n-select>-->
-              </n-form-item-grid-item>
+							<!--              </n-form-item-grid-item>-->
-              <n-form-item-grid-item v-if="addForm.isMain === 0" label="所属总表" path="parentId">
+							<!--              <n-form-item-grid-item v-if="addForm.isMain === 0" label="所属总表" path="parentId">-->
-                <n-select
+							<!--                <n-select-->
-                  v-model:value="addForm.parentId"
+							<!--                  v-model:value="addForm.parentId"-->
-                  :options="parentGeneralTableList"
+							<!--                  :options="parentGeneralTableList"-->
-                  class="w-full"
+							<!--                  class="w-full"-->
-                  placeholder="请选择所属总表"
+							<!--                  placeholder="请选择所属总表"-->
-                  :loading="parentLoading"
+							<!--                  :loading="parentLoading"-->
-                  @update-show="getParentGeneralTableList"
+							<!--                  @update-show="getParentGeneralTableList"-->
-                ></n-select>
+							<!--                ></n-select>-->
-              </n-form-item-grid-item>
+							<!--              </n-form-item-grid-item>-->
 							<n-form-item-grid-item label="制造商">
 								<n-input v-model:value="addForm.manufacturer" placeholder="请输入设备名称"></n-input>
 							</n-form-item-grid-item>
@@ -469,24 +469,24 @@ const columns: Ref<DataTableColumns<Energy.energyDevice.Columns>> = ref([
 		key: 'electricDeviceCode',
 		width: 180
 	},
-  {
+	// {
-    title: '是否总表',
+	//   title: '是否总表',
-    key: '',
+	//   key: '',
-    width: 100,
+	//   width: 100,
-    render: row => (
+	//   render: row => (
-      <n-tag type={Number(row.isMain) === 1 ? 'success' : 'warning'}>{Number(row.isMain) === 1 ? '是' : '否'}</n-tag>
+	//     <n-tag type={Number(row.isMain) === 1 ? 'success' : 'warning'}>{Number(row.isMain) === 1 ? '是' : '否'}</n-tag>
-    )
+	//   )
-  },
+	// },
-  {
+	// {
-    title: '所属总表',
+	//   title: '所属总表',
-    key: 'parentName',
+	//   key: 'parentName',
-    width: 120
+	//   width: 120
-  },
+	// },
-  {
+	// {
-    title: '安装位置',
+	//   title: '安装位置',
-    key: 'location',
+	//   key: 'location',
-    width: 140
+	//   width: 140
-  },
+	// },
 	{
 		title: '制造商',
 		key: 'manufacturer',

src/views/quality/drawingProcessCheckRecord/index.vue

@@ -102,15 +102,15 @@ const columns: Ref<DataTableColumns<drawingProcessCheckRecord.TableList>> = ref(
 		align: 'center',
 		width: 100,
 		render: row => {
-      return row.workOrdeType === '0' ? '拉丝' : '漆包';
+			return row.workOrdeType === '0' ? '板材' : '金属';
 		}
 	},
-  {
+	// {
-    title: '线径数据',
+	//   title: '线径数据',
-    key: 'attr1',
+	//   key: 'attr1',
-    align: 'center',
+	//   align: 'center',
-    width: 100
+	//   width: 100
-  },
+	// },
 	{
 		title: '机台',
 		key: 'deviceName',
@@ -134,15 +134,15 @@ const columns: Ref<DataTableColumns<drawingProcessCheckRecord.TableList>> = ref(
 			tooltip: true
 		}
 	},
-  {
+	// {
-    title: '客户',
+	//   title: '客户',
-    key: 'clientName',
+	//   key: 'clientName',
-    align: 'center',
+	//   align: 'center',
-    width: 140,
+	//   width: 140,
-    ellipsis: {
+	//   ellipsis: {
-      tooltip: true
+	//     tooltip: true
-    }
+	//   }
-  },
+	// },
 	{
 		title: '生产工单号',
 		key: 'generateWorkOrderNumber',