Merge remote-tracking branch 'origin/master'

src/views/system/business-dept-config.vue

@@ -79,13 +79,6 @@
           />
         </el-select>
       </template>
-      <template #kingdeeCompanyCode-form>
-        <el-input
-          v-model="form.kingdeeCompanyCode"
-          disabled
-          placeholder="关联组织中配置的平台公司金蝶代码"
-        />
-      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -192,10 +185,8 @@ export default {
             prop: 'kingdeeCompanyCode',
             minWidth: 140,
             span: 12,
-            formslot: true,
-            addDisplay: true,
-            editDisplay: true,
-            hide: true,
+            maxlength: 64,
+            rules: [{ required: true, message: '请输入金蝶公司代码', trigger: 'blur' }],
           },
           {
             label: '初始流水号',
@@ -279,7 +270,6 @@ export default {
       return (list || []).map(item => ({
         label: item.deptName || item.fullName || String(item.id),
         value: String(item.id),
-        kingdeeDeptCode: item.kingdeeDeptCode || '',
       }));
     },
     formatSerial(value) {
@@ -291,7 +281,6 @@ export default {
     handlePlatformCompanyChange(value) {
       const matched = this.platformCompanyOptions.find(item => String(item.value) === String(value));
       this.form.platformCompanyName = matched ? matched.label : '';
-      this.form.kingdeeCompanyCode = matched ? matched.kingdeeDeptCode || '' : '';
     },
     handleBusinessDeptChange(value) {
       const matched = this.businessDeptOptions.find(item => String(item.value) === String(value));
@@ -336,6 +325,7 @@ export default {
         platformCompanyId: row.platformCompanyId || null,
         businessDeptId: row.businessDeptId || null,
         contractCodePrefix: String(row.contractCodePrefix || '').trim(),
+        kingdeeCompanyCode: String(row.kingdeeCompanyCode || '').trim(),
         kingdeeDeptCode: String(row.kingdeeDeptCode || '').trim(),
         remark: String(row.remark || '').trim(),
         initialSerial: Number.isFinite(initialSerial) ? initialSerial : null,