费控模块部分功能完善

src/views/EHSD/productLibrary/companyProduct/index.vue

@@ -80,14 +80,14 @@
               <el-table :data="formData.data.rawMaterialList" style="width: 100%; margin-top: 16px">
                 <el-table-column prop="rawMaterialName" label="原材料名称" />
                 <el-table-column prop="rawMaterialCode" label="原材料编码" />
-                <el-table-column label="规格尺寸 (cm)" width="140">
+                <el-table-column label="规格尺寸 (cm)">
                   <template #default="{ row, $index }">
                     <div style="width: 100%" v-if="row.rawMaterialLength&&row.rawMaterialWidth && row.rawMaterialHeight">
                       {{row.rawMaterialLength}}*{{row.rawMaterialWidth}}*{{row.rawMaterialHeight}}
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column prop="rawMaterialColor" label="颜色" width="170" />
+                <el-table-column prop="rawMaterialColor" label="颜色" />
               </el-table>
             </div>
           </template>

src/views/EHSD/productLibrary/waitCreateProduct/index.vue

@@ -59,14 +59,14 @@
               <el-table :data="formData.data.rawMaterialList" style="width: 100%; margin-top: 16px">
                 <el-table-column prop="rawMaterialName" label="原材料名称" />
                 <el-table-column prop="rawMaterialCode" label="原材料编码" />
-                <el-table-column label="规格尺寸 (cm)" width="140">
+                <el-table-column label="规格尺寸 (cm)">
                   <template #default="{ row, $index }">
                     <div style="width: 100%" v-if="row.rawMaterialLength&&row.rawMaterialWidth && row.rawMaterialHeight">
                       {{row.rawMaterialLength}}*{{row.rawMaterialWidth}}*{{row.rawMaterialHeight}}
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column prop="rawMaterialColor" label="颜色" width="170" />
+                <el-table-column prop="rawMaterialColor" label="颜色" />
               </el-table>
             </div>
           </template>

src/views/EHSD/saleContract/accountingSubjects/index.vue

@@ -29,7 +29,7 @@
       </el-table>
     </div>
 
-    <el-dialog :title="modalType == 'add' ? '添加科目' : '编辑科目'" v-if="dialogVisible" v-model="dialogVisible" width="500" v-loading="loadingDialog">
+    <el-dialog :title="modalType == 'add' ? '添加科目' : '编辑科目'" v-if="dialogVisible" v-model="dialogVisible" width="50%" v-loading="loadingDialog">
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
         <!-- <template #parentId>
           <div style="width: 100%">
@@ -68,7 +68,9 @@ import byForm from "@/components/byForm/index";
 import useUserStore from "@/store/modules/user";
 
 const { proxy } = getCurrentInstance();
-
+const accountingSubjects = computed(
+  () => proxy.useUserStore().allDict["accounting_subjects"]
+);
 const defaultProps = {
   children: "children",
   label: "subjectsName",
@@ -194,10 +196,19 @@ const formConfig = computed(() => {
     //   fn: (val) => {},
     // },
     {
-      type: "input",
-      prop: "calculateItemName",
+      type: "select",
       label: "核算项目名称",
+      prop: "calculateItemName",
+      itemWidth: 100,
+      data: accountingSubjects.value,
+      multiple: true,
     },
+
+    // {
+    //   type: "input",
+    //   prop: "calculateItemName",
+    //   label: "核算项目名称",
+    // },
     // {
     //   type: "slot",
     //   prop: "orderNum",
@@ -229,6 +240,9 @@ const rules = ref({
   paymentTypeId: [
     { required: true, message: "请选择收费款类型", trigger: "change" },
   ],
+  calculateItemName: [
+    { required: true, message: "请选择核算项目名称", trigger: "change" },
+  ],
 });
 const disabledType = ref(false);
 const openModal = (row) => {
@@ -236,6 +250,7 @@ const openModal = (row) => {
   modalType.value = "add";
   formData.data = {
     parentId: "",
+    calculateItemName: [],
   };
   if (row && row.id) {
     formData.data.parentId = row.id;
@@ -247,13 +262,20 @@ const openModal = (row) => {
 const submitForm = () => {
   submit.value.handleSubmit(() => {
     loadingDialog.value = true;
-    proxy
-      .post("/accountSubjects/" + modalType.value, formData.data)
-      .then(() => {
+    formData.data.calculateItemName = formData.data.calculateItemName.join(",");
+    proxy.post("/accountSubjects/" + modalType.value, formData.data).then(
+      () => {
         proxy.msgTip("操作成功", 1);
         dialogVisible.value = false;
+        loadingDialog.value = false;
         getList();
-      });
+      },
+      (err) => {
+        formData.data.calculateItemName =
+          formData.data.calculateItemName.split(",");
+        loadingDialog.value = false;
+      }
+    );
   });
 };
 
@@ -279,6 +301,7 @@ const checkIsTopData = (parentId) => {
 
 const getDtl = (row) => {
   formData.data = proxy.deepClone(row);
+  formData.data.calculateItemName = formData.data.calculateItemName.split(",");
   modalType.value = "edit";
   dialogVisible.value = true;
 };

src/views/systemTenant/tenant/userTenant/index.vue

@@ -351,13 +351,22 @@ const formConfig = computed(() => {
       clearable: false,
       data: companyData.value,
     },
-    // {
-    //   type: "select",
-    //   label: "业务员等级",
-    //   prop: "saleLv",
-    //   multiple: false,
-    //   data: roleData.value,
-    // },
+    {
+      type: "select",
+      label: "身份",
+      prop: "identity",
+      multiple: false,
+      data: [
+        {
+          label: "职员",
+          value: 10,
+        },
+        {
+          label: "股东",
+          value: 20,
+        },
+      ],
+    },
     {
       type: "input",
       prop: "accountBank",
@@ -398,6 +407,7 @@ const rules = ref({
   companySet: [
     { required: true, message: "请选择关联公司", trigger: "change" },
   ],
+  identity: [{ required: true, message: "请选择身份", trigger: "change" }],
 });
 
 const changeRoleId = (val) => {
@@ -525,6 +535,7 @@ const openModal = () => {
     companySet: [],
     purchaseRange: [],
     purchaseRangeOne: [],
+    identity: 10,
   };
   loadingDialog.value = false;
   dialogVisible.value = true;