冲突合并

src/views/user/goodsManagement/index.vue

@@ -368,7 +368,7 @@ const dialogTypeChange = () => {
 //获取所属公司下拉数据
 const getCompanyList = async () => {
     const res: any = await getCompanyListApi()
-    console.log(res, '列表数据**--**')
+    console.log(res, '列表数据**--**-----------')
     companyDataList.value = res.data
 }
 // 装备弹框显示隐藏
@@ -928,7 +928,8 @@ const handleRemove = (list: any, index: Number) => {
                         autocomplete="off"
                         style="width: 350px" maxlength="40"
                         v-model="equipmentDeploymentParams.code"
-                        clearable />
+                        clearable
+                    />
                 </el-form-item> -->
                 <el-form-item label="装备品牌" prop="brand">
                     <el-input
@@ -986,7 +987,7 @@ const handleRemove = (list: any, index: Number) => {
                 </el-form-item>
             </el-row>
             <el-row>
-                <el-form-item label="整机重量(KG)：" prop="deviceWeight">
+                <el-form-item label="整机重量(KG)：">
                     <el-input
                         @input="
                             (v) =>