feat(port): 添加港口信息中的国家字段功能

- 在搜索表单中添加国家输入框
- 在编辑表单中添加国家字段，调整布局为三列显示
- 更新searchData数据结构，添加country字段
- 在表格列配置中添加国家列显示
- 更新portForm数据结构，添加country字段
- 在编辑时正确初始化国家字段值

feat(supplier): 添加供应商列表中的活跃状态功能

- 在搜索表单中添加活跃状态下拉选择框
- 实现表格中状态字段的条件渲染和样式绑定
- 调整供应商编辑表单布局，添加活跃状态选择
- 更新currentSupplier数据结构，添加status字段
- 在表格列配置中动态添加活跃状态列
- 添加getStatusClass方法处理状态样式
- 初始化供应商时设置默认活跃状态为Active
- 添加CSS样式定义活跃和非活跃状态的颜色

chore(user): 将用户模块中的角色相关文案替换为岗位

- 修改新增用户角色对话框标题为"岗位"
- 更新表单标签中的"角色编码"为"岗位编码"
- 更新表单标签中的"角色名称"为"岗位名称"
- 修改可选角色区域标题为"可选岗位"
- 更新表格列标题中的"角色编码"为"岗位编码"
- 更新表格列标题中的"角色名称"为"岗位名称"
- 修改已有角色区域标题为"已有岗位"

src/views/modules/port/portInfo.vue

@@ -11,6 +11,9 @@
           <el-form-item label="港口名称:">
             <el-input v-model="searchData.portName" style="width: 150px" clearable placeholder="请输入港口名称"></el-input>
           </el-form-item>
+          <el-form-item label="国家:">
+            <el-input v-model="searchData.country" style="width: 150px" clearable placeholder="请输入国家"></el-input>
+          </el-form-item>
           <el-form-item label=" ">
             <el-button class="customer-bun-min" type="primary" @click="getMainData">查询</el-button>
             <el-button @click="resetSearch" style="margin-left: 2px">重置</el-button>
@@ -97,16 +100,21 @@
           label-position="top"
           class="part-form">
           <el-row :gutter="20">
-            <el-col :span="12">
+            <el-col :span="8">
               <el-form-item label="港口编码" prop="portCode">
                 <el-input v-model="portForm.portCode" :disabled="dialogType === 'edit'" placeholder="请输入港口编码"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
               <el-form-item label="港口名称" prop="portName">
                 <el-input v-model="portForm.portName" placeholder="请输入港口名称"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="国家" prop="country">
+                <el-input v-model="portForm.country" placeholder="请输入国家名称"></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
@@ -195,6 +203,7 @@ export default {
       searchData: {
         portCode: '',
         portName: '',
+        country: '',
         page: 1,
         limit: 20
       },
@@ -203,6 +212,7 @@ export default {
       columnArray1: [
         { columnProp: 'portCode', columnLabel: '港口编码', columnWidth: '120', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
         { columnProp: 'portName', columnLabel: '港口名称', columnWidth: '180', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
+        { columnProp: 'country', columnLabel: '国家', columnWidth: '180', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
         { columnProp: 'isDeparturePort', columnLabel: '是否起始港', columnWidth: '100', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
         { columnProp: 'isDestinationPort', columnLabel: '是否目的港', columnWidth: '100', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
         { columnProp: 'active', columnLabel: '是否在用', columnWidth: '100', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
@@ -219,6 +229,7 @@ export default {
       portForm: {
         portCode: '',
         portName: '',
+        country:'',
         active: 'Y',
         isDeparturePort: 'Y',
         isDestinationPort: 'N',
@@ -368,6 +379,7 @@ export default {
       this.portForm = {
         portCode: row.portCode,
         portName: row.portName,
+        country: row.country || '',
         active: row.active || 'Y',
         isDeparturePort: row.isDeparturePort || 'Y',
         isDestinationPort: row.isDestinationPort || 'N',

src/views/modules/srmSupplier/supplierList.vue

@@ -17,6 +17,12 @@
               <el-option label="N" value="N"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item :label="'活跃状态:'">
+            <el-select v-model="searchData.status"  style="width: 130px">
+              <el-option label="Active" value="Active"></el-option>
+              <el-option label="Inactive" value="Inactive"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <span style="cursor: pointer" slot="label" @click="getBaseList(530, 'mainPlanner')"><a href="#">Planner</a></span>
             <el-input v-model="searchData.planner" clearable readonly style="width: 130px"></el-input>
@@ -51,13 +57,18 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden">{{
-            item.columnProp === 'paymentTermDesc'
-              ? (scope.row.paymentTermDesc || scope.row.paymentTerm)
-              : item.columnProp === 'deliveryTermDesc'
-                ? (scope.row.deliveryTermDesc || scope.row.deliveryTerm)
-                  : scope.row[item.columnProp]
-          }}</span>
+          <span v-if="!item.columnHidden">
+            <span v-if="item.columnProp === 'paymentTermDesc'">
+              {{ scope.row.paymentTermDesc || scope.row.paymentTerm }}
+            </span>
+            <span v-else-if="item.columnProp === 'deliveryTermDesc'">
+              {{ scope.row.deliveryTermDesc || scope.row.deliveryTerm }}
+            </span>
+            <span v-else-if="item.columnProp === 'status'" :class="getStatusClass(scope.row.status)">
+              {{ scope.row.status }}
+            </span>
+            <span v-else>{{ scope.row[item.columnProp] }}</span>
+          </span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                              style="width: 100px; height: 100px"/></span>
         </template>
@@ -177,11 +188,19 @@
               </el-col>
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="24">
+              <el-col :span="18">
                 <el-form-item label="供应商名称" prop="supplierName">
                   <el-input v-model="currentSupplier.supplierName"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item label="活跃状态" prop="status">
+                  <el-select v-model="currentSupplier.status" placeholder="请选择" style="width: 100%">
+                    <el-option label="Active" value="Active"></el-option>
+                    <el-option label="Inactive" value="Inactive"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row :gutter="24">
               <el-col :span="6">
@@ -399,6 +418,7 @@ export default {
         supplierNo: '',
         supplierName: '',
         active: '',
+        status: '',
         currency:'',
         taxCode:'',
         paymentTerm:'',
@@ -473,6 +493,24 @@ export default {
           status: true,
           fixed: false
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: this.functionId,
+          serialNumber: '811001Table1SupplierGroup',
+          tableId: '811001Table1',
+          tableName: '供应商信息',
+          columnProp: 'status',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '活跃状态',
+          columnWidth: '100',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
         {
           userId: this.$store.state.user.name,
           functionId: this.functionId,
@@ -1257,6 +1295,12 @@ export default {
     }
   },
   methods: {
+    getStatusClass (status) {
+      return {
+        'status-active': status === 'Active',
+        'status-inactive': status === 'Inactive'
+      }
+    },
     loadMainOrReminder () {
       const raw = this.$route.query.docExpireSupplierIds
       if (raw !== undefined && raw !== null && String(raw).trim() !== '') {
@@ -1575,6 +1619,7 @@ export default {
         supplierName: '',
         supplierDocType: '',
         active: 'Y',
+        status: 'Active',
         supplierGroup: '',
         abc: '',
         buyer: '',
@@ -1805,4 +1850,9 @@ export default {
     height: 28px;
   }
 }
+
+.status-active,
+.status-inactive {
+  color: #ff0000;
+}
 </style>

src/views/modules/sys/user.vue

@@ -558,13 +558,13 @@
     </el-dialog>
 
     <!--  新增用户角色  -->
-    <el-dialog title="角色" :close-on-click-modal="false" v-drag :visible.sync="businessRoleAddModal" width="900px">
+    <el-dialog title="岗位" :close-on-click-modal="false" v-drag :visible.sync="businessRoleAddModal" width="900px">
       <div style="font-size: 12px">
         <el-form :inline="true" label-position="top" :model="businessRoleData">
-          <el-form-item :label="'角色编码'">
+          <el-form-item :label="'岗位编码'">
             <el-input v-model="businessRoleData.roleNo" clearable style="width: 120px"></el-input>
           </el-form-item>
-          <el-form-item :label="'角色名称'">
+          <el-form-item :label="'岗位名称'">
             <el-input v-model="businessRoleData.roleDesc" clearable style="width: 200px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
@@ -574,7 +574,7 @@
       </div>
       <el-container style="margin-top: 0px;">
         <el-main style="width: 400px; padding: 1px">
-          <span style="font-size: 12px" >可选角色</span>
+          <span style="font-size: 12px" >可选岗位</span>
           <el-table
             height="400px"
             :data="businessRoleList1"
@@ -596,14 +596,14 @@
               header-align="center"
               align="center"
               min-width="80"
-              label="角色编码">
+              label="岗位编码">
             </el-table-column>
             <el-table-column
               prop="roleDesc"
               header-align="center"
               align="center"
               min-width="120"
-              label="角色名称">
+              label="岗位名称">
             </el-table-column>
           </el-table>
         </el-main>
@@ -616,7 +616,7 @@
           </div>
         </el-main>
         <el-main style="width: 400px;padding: 1px">
-          <span style="font-size: 12px" >已有角色</span>
+          <span style="font-size: 12px" >已有岗位</span>
           <el-table
             height="400px"
             :data="businessRoleList2"
@@ -638,14 +638,14 @@
               header-align="center"
               align="center"
               min-width="80"
-              label="角色编码">
+              label="岗位编码">
             </el-table-column>
             <el-table-column
               prop="roleDesc"
               header-align="center"
               align="center"
               min-width="120"
-              label="角色名称">
+              label="岗位名称">
             </el-table-column>
           </el-table>
         </el-main>