设备、设备树修改

src/views/module_base/space/SpaceList.vue

@@ -80,8 +80,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleAddChild(record)">添加下级</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteNode(record.id)" placement="topLeft">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -94,7 +100,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>

src/views/module_tpm/equipment/modules/EquipmentForm.vue

@@ -61,14 +61,17 @@
           </a-col>
           <a-col :span="12">
             <a-form-model-item label="周期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentCycle">
-              <a-input-number v-model="model.equipmentCycle" placeholder="请输入周期" style="width: 100%" />
+              <a-input-number v-model="model.equipmentCycle" style="width:49%;" placeholder="请输入周期" />
+              <j-dict-select-tag type="list" v-model="model.cycleUnit" dictCode="cycle_unit" style="width:49%;" placeholder="请选择周期单位" />
             </a-form-model-item>
+            <!-- <a-form-model-item prop="cycleUnit" style="width:40%;">
+            </a-form-model-item> -->
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-model-item label="周期单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cycleUnit">
               <j-dict-select-tag type="list" v-model="model.cycleUnit" dictCode="cycle_unit" placeholder="请选择周期单位" />
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="12">
             <a-form-model-item label="出厂编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryNo">
               <a-input v-model="model.factoryNo" placeholder="请输入出厂编号"  ></a-input>
@@ -133,6 +136,10 @@
     data () {
       return {
         model:{
+          manageStatus: "1",
+          spaceid: "1780065347359883265",
+          responseDepartment: "67fc001af12a4f9b8458005d3f19934a",
+          spec: "无",
          },
         labelCol: {
           xs: { span: 24 },
@@ -150,6 +157,18 @@
           equipmenttreeid: [
             { required: true, message: '请选择设备分类!'},
           ],
+          spec: [
+            { required: true, message: '请输入规格型号!'},
+          ],
+          spaceid: [
+            { required: true, message: '请选择区域!'},
+          ],
+          responseDepartment: [
+            { required: true, message: '请选择责任部门!'},
+          ],
+          manageStatus: [
+            { required: true, message: '请选择管理状态!'},
+          ],
         },
         url: {
           add: "/tpmEquipment/tpmEquipment/add",

src/views/module_tpm/equipmentTree/EquipmentTreeList.vue

@@ -139,6 +139,11 @@
             dataIndex: 'name'
           },
           {
+            title:'排序',
+            align:"right",
+            dataIndex: 'sortorder'
+          },
+          {
             title: '操作',
             dataIndex: 'action',
             align:"center",

src/views/module_tpm/equipmentTree/modules/EquipmentTreeModal.vue

@@ -25,6 +25,9 @@
             >
           </j-tree-select>
         </a-form-model-item>
+        <a-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sortorder">
+          <a-input-number v-model="model.sortorder" placeholder="请输入排序" ></a-input-number>
+        </a-form-model-item>
 
       </a-form-model>
     </a-spin>
@@ -62,9 +65,9 @@
             { required: true, message: '请输入设备分类名称!'},
             { validator: this.validateTemplateCode}
           ],
-          // parentid: [
-          //   { required: true, message: '请选择上级!'},
-          // ],
+          sortorder: [
+            { required: true, message: '请输入排序!'},
+          ],
         },
         url: {
           add: "/tpmEquipmentTree/tpmEquipmentTree/add",
@@ -85,7 +88,7 @@
           tableName: "tpm_equipment_tree",
           fieldName: "name",
           fieldVal: value,
-          dataId: this.model.name
+          dataId: this.model.id
         }
         duplicateCheck(params).then((res)=>{
           if(res.success){