费控bug更改

src/components/process/SF/CostControl.vue

@@ -405,7 +405,8 @@
                                     @change="(val)=>changeAccountSubjectsId(val,$index)" /> -->
 
                     <el-select v-model="row.accountSubjectsId" :placeholder="'请选择'" style="width: 100%" filterable
-                               @change="(val)=>changeAccountSubjectsId(val,$index)" :disabled="!isHaveAccount || !isHaveFinance">
+                               @change="(val)=>changeAccountSubjectsId(val,$index)"
+                               :disabled="route.query.processType==undefined || !isHaveAccount || !isHaveFinance">
                       <el-option v-for="item in accountSubjectsList" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </el-form-item>
@@ -437,14 +438,15 @@
                     <el-tree-select v-model="row.submitMapData[key]" :data="selectDataMap[key]" check-strictly node-key="deptId"
                                     :props="defaultPropsDept" :placeholder="'请选择'+key" style="width:100%" filterable
                                     v-if="['核算中心', '部门' ].includes(key)" @change="(val)=>getLabelData(val,key,$index)"
-                                    :disabled="!isHaveAccount || !isHaveFinance" />
+                                    :disabled="route.query.processType==undefined || !isHaveAccount || !isHaveFinance" />
                     <div v-else-if="['客户'].includes(key)">
                       <el-button type="primary" @click="handleOpenSelectCustomer($index)" plain v-if="getAccountSubjectsId" style="margin-bottom:10px"
-                                 :disabled="!isHaveAccount || !isHaveFinance">选择客户</el-button>
+                                 :disabled="route.query.processType==undefined || !isHaveAccount || !isHaveFinance">选择客户</el-button>
                       <el-input v-model="row.customerName" placeholder="请选择客户" disabled></el-input>
                     </div>
                     <el-select v-model="row.submitMapData[key]" :placeholder="'请选择'+key" style="width: 100%" filterable v-else
-                               @change="(val)=>getLabelData(val,key,$index)" :disabled="!isHaveAccount || !isHaveFinance">
+                               @change="(val)=>getLabelData(val,key,$index)"
+                               :disabled=" route.query.processType==undefined || !isHaveAccount || !isHaveFinance">
                       <el-option v-for="item in selectDataMap[key]" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </div>
@@ -456,7 +458,7 @@
                 <div style="width: 100%">
                   <el-form-item :prop="'costControlDetailList.' + $index + '.money'" :rules="rules.money" :inline-message="true" class="margin-b-0">
                     <el-input-number onmousewheel="return false;" v-model="row.money" placeholder=" " style="width: 100%" :precision="2"
-                                     :controls="false" :min="0" :disabled="!isHaveAccount || !isHaveFinance" />
+                                     :controls="false" :min="0" :disabled="true" />
                   </el-form-item>
                 </div>
               </template>
@@ -1164,6 +1166,18 @@ const changApplyUserId = (val) => {
     formData.data.accountBank = current.accountBank;
     formData.data.accountName = current.accountName;
     formData.data.accountNumber = current.accountNumber;
+    for (let i = 0; i < formData.data.costControlDetailList.length; i++) {
+      const row = formData.data.costControlDetailList[i];
+      if (
+        row.subjectsCalculateItemNameList &&
+        row.subjectsCalculateItemNameList.includes("职员")
+      ) {
+        row.submitMapData["职员"] = val;
+        row.submitMapLabelData["职员"] = current.label || "";
+        row.submitMapCodeData["职员"] = current.jdSubjectCode || "";
+        handleGetRemark(i);
+      }
+    }
   }
 };
 const isFormDetail = ref(false);
@@ -1219,8 +1233,8 @@ const requestUrl = {
   专利: "/patent/page",
   部门: "/tenantDept/list",
   快递公司: "/logisticsCompanyInfo/page",
-  股东: "/tenantUser/list",
-  职员: "/tenantUser/list",
+  股东: "/tenantUser/listAll",
+  职员: "/tenantUser/listAll",
   承包商: "/contractor/page",
   客户: "",
   店铺: "/shopInfo/page",
@@ -1265,8 +1279,8 @@ const getCorrespondSelectData = () => {
             pageNum: 1,
             pageSize: 10000,
             tenantId: proxy.useUserStore().user.tenantId,
-            companyId: formData.data.companyId || "",
-            identity,
+            // companyId: formData.data.companyId || "",
+            // identity,
           })
           .then((res) => {
             selectDataMap.value[key] = res.rows.map((x) => ({
@@ -1849,6 +1863,19 @@ const handleGetRemark = (index) => {
 };
 
 const clickAdd = () => {
+  let submitMapData = {};
+  let submitMapLabelData = {};
+  let submitMapCodeData = {};
+  let userId = formData.data.applyUserId;
+  for (let i = 0; i < subjectsCalculateItemNameList.value.length; i++) {
+    const key = subjectsCalculateItemNameList.value[i];
+    if (["职员"].includes(key)) {
+      submitMapData[key] = userId;
+      let current = userList.value.find((x) => x.value == userId);
+      submitMapLabelData[key] = current.label || "";
+      submitMapCodeData[key] = current.jdSubjectCode || "";
+    }
+  }
   if (
     formData.data.costControlDetailList &&
     formData.data.costControlDetailList.length > 0
@@ -1863,9 +1890,9 @@ const clickAdd = () => {
       subjectsCalculateItemName: subjectsCalculateItemName.value,
       accountSubjectsNames: accountSubjectsNames.value,
       subjectsCalculateItemNameList: subjectsCalculateItemNameList.value,
-      submitMapData: {},
-      submitMapLabelData: {},
-      submitMapCodeData: {},
+      submitMapData: submitMapData,
+      submitMapLabelData: submitMapLabelData,
+      submitMapCodeData: submitMapCodeData,
       logisticsCompanyId: "",
       invoiceTaxPoint: "",
       currentPayable: null,
@@ -1902,9 +1929,9 @@ const clickAdd = () => {
         subjectsCalculateItemName: subjectsCalculateItemName.value,
         accountSubjectsNames: accountSubjectsNames.value,
         subjectsCalculateItemNameList: subjectsCalculateItemNameList.value,
-        submitMapData: {},
-        submitMapLabelData: {},
-        submitMapCodeData: {},
+        submitMapData: submitMapData,
+        submitMapLabelData: submitMapLabelData,
+        submitMapCodeData: submitMapCodeData,
         logisticsCompanyId: "",
         invoiceTaxPoint: "",
         currentPayable: null,
@@ -2142,6 +2169,11 @@ const handleSubmit = async (isStag = false) => {
                 "---" +
                 row.submitMapLabelData[key] +
                 (j < row.subjectsCalculateItemNameList.length - 1 ? "||" : "");
+            } else {
+              if (route.query.processType == 10) {
+                proxy.msgTip("请选择核算项目名称", 2);
+                return false;
+              }
             }
           }
         }
@@ -2263,6 +2295,8 @@ const getAllData = (businessId) => {
         // }
         //  数据处理并回显
         row.submitMapData = {};
+        row.submitMapLabelData = {};
+        row.submitMapCodeData = {};
         if (row.calculateItemList && row.calculateItemList.length > 0) {
           for (let j = 0; j < row.calculateItemList.length; j++) {
             const jele = row.calculateItemList[j];
@@ -2389,6 +2423,9 @@ onMounted(() => {
   getDeptData(formData.data.companyId);
   isDisabled.value = judgeStatus();
   // formOption.disabled = judgeStatus();
+  if (route.query.processType && route.query.processType == 20) {
+    formOption.disabled = true;
+  }
   if (proxy.useUserStore().roles.includes("accountant")) {
     isHaveAccount.value = true;
   }

src/components/product/SelectMaterial.vue

@@ -97,20 +97,20 @@
                 <el-row>
                   <el-col :span="8">
                     <el-form-item prop="length" label-width="0px" class="margin-b-0 wid100">
-                      <el-input-number v-model="formData.data.length" placeholder="请输入" style="width: 100%" :precision="2" :controls="false" :min="0"
-                                       onmousewheel="return false;" />
+                      <el-input-number v-model="formData.data.length" placeholder="请输入长（cm）" style="width: 100%" :precision="2" :controls="false"
+                                       :min="0" onmousewheel="return false;" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item prop="width" label-width="0px" class="margin-b-0 wid100">
-                      <el-input-number v-model="formData.data.width" placeholder="请输入" style="width: 100%" :precision="2" :controls="false" :min="0"
-                                       onmousewheel="return false;" />
+                      <el-input-number v-model="formData.data.width" placeholder="请输入宽（cm）" style="width: 100%" :precision="2" :controls="false"
+                                       :min="0" onmousewheel="return false;" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item prop="height" label-width="0px" class="margin-b-0 wid100">
-                      <el-input-number v-model="formData.data.height" placeholder="请输入" style="width: 100%" :precision="2" :controls="false" :min="0"
-                                       onmousewheel="return false;" />
+                      <el-input-number v-model="formData.data.height" placeholder="请输入高（cm）" style="width: 100%" :precision="2" :controls="false"
+                                       :min="0" onmousewheel="return false;" />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -518,13 +518,24 @@ const formConfig = computed(() => {
       type: "number",
       prop: "price",
       label: "销售价(cm²)",
-      precision: 2,
+      precision: 3,
       min: 0.01,
       controls: false,
       itemWidth: 50,
       isShow: isSpecial.value,
     },
     {
+      type: "select",
+      prop: "attrRawMaterialId",
+      label: "关联原材料(无属性)",
+      itemWidth: 50,
+      data: rawMaterialData.value,
+      filterable: true,
+      disabled: false,
+      fn: (val) => {},
+      isShow: !isSpecial.value && isShowLabel.value,
+    },
+    {
       type: "uploadImg",
       // limit: 1,
       // listType: "picture-card",
@@ -598,11 +609,11 @@ const formConfig = computed(() => {
     //   label: "备注",
     //   itemType: "textarea",
     // },
-    {
-      type: "title1",
-      title: "规格",
-      isShow: !isSpecial.value,
-    },
+    // {
+    //   type: "title1",
+    //   title: "规格",
+    //   isShow: !isSpecial.value,
+    // },
     {
       type: "input",
       prop: "color",
@@ -722,7 +733,11 @@ const openModal = () => {
   formData.data = {
     definition: "2",
     fileList: [],
+    productClassifyId: sourceList.value.pagination.productClassifyId || "",
   };
+  if (formData.data.productClassifyId) {
+    changeProductClassifyId(formData.data.productClassifyId);
+  }
   // if (currencyData.value && currencyData.value.length > 0) {
   //   formData.data.currency = currencyData.value[0].dictKey;
   //   formData.data.costCurrency = currencyData.value[0].dictKey;
@@ -731,9 +746,9 @@ const openModal = () => {
 
 const submitForm = () => {
   formDom.value.handleSubmit((valid) => {
-    if (!formData.data.fileList.length > 0) {
-      return proxy.msgTip("请上传图片", 2);
-    }
+    // if (!formData.data.fileList.length > 0) {
+    //   return proxy.msgTip("请上传图片", 2);
+    // }
     submitLoading.value = true;
     proxy.post("/productInfo/" + modalType.value, formData.data).then(
       (res) => {

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

@@ -85,7 +85,7 @@ const modalType = ref("add");
 const selectConfig = computed(() => [
   {
     label: "确认状态",
-    prop: "isClaim",
+    prop: "confirmStatus",
     data: claimStatus.value,
   },
   {
@@ -160,7 +160,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "交易摘要",
-        prop: "remarks",
+        prop: "remark",
         "min-width": 200,
       },
     },
@@ -209,7 +209,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "确认状态",
-        prop: "isClaim",
+        prop: "confirmStatus",
         width: 80,
         fixed: "right",
       },
@@ -226,7 +226,7 @@ const config = computed(() => {
       },
       renderHTML(row) {
         return [
-          row.isClaim == "0"
+          row.confirmStatus == "0"
             ? {
                 attrs: {
                   label: "确认",

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

@@ -92,7 +92,7 @@ const sourceList = ref({
     pageNum: 1,
     pageSize: 10,
     keyword: "",
-    isClaim: "",
+    confirmStatus: "",
     beginTime: "",
     endTime: "",
   },
@@ -116,7 +116,7 @@ const modalType = ref("add");
 const selectConfig = computed(() => [
   {
     label: "确认状态",
-    prop: "isClaim",
+    prop: "confirmStatus",
     data: claimStatus.value,
   },
   {
@@ -177,7 +177,7 @@ const config = computed(() => {
       attrs: {
         label: "交易日期",
         prop: "transactionTime",
-        width: 100,
+        width: 160,
       },
     },
     {
@@ -191,7 +191,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "交易摘要",
-        prop: "remarks",
+        prop: "remark",
         "min-width": 200,
       },
     },
@@ -220,7 +220,7 @@ const config = computed(() => {
       attrs: {
         label: "收款人",
         prop: "myAccountName",
-        width: 100,
+        width: 130,
       },
     },
     {
@@ -240,7 +240,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "确认状态",
-        prop: "isClaim",
+        prop: "confirmStatus",
         width: 80,
         fixed: "right",
       },
@@ -268,7 +268,7 @@ const config = computed(() => {
           //     getDtl(row);
           //   },
           // },
-          row.isClaim == "0"
+          row.confirmStatus == "0"
             ? {
                 attrs: {
                   label: "删除",
@@ -370,7 +370,7 @@ const formConfig = computed(() => {
     {
       type: "input",
       itemType: "textarea",
-      prop: "remarks",
+      prop: "remark",
       label: "交易摘要",
       itemWidth: 100,
     },

src/views/JST/shopManage/index.vue

@@ -287,12 +287,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "核算项目编号",
+      label: "金蝶编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "核算项目名称",
+      label: "金蝶名称",
     },
   ];
 });

src/views/finance/fundManage/kdCompany/index.vue

@@ -257,12 +257,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "核算项目编号",
+      label: "金蝶编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "核算项目名称",
+      label: "金蝶名称",
     },
   ];
 });

src/views/finance/fundManage/payee/index.vue

@@ -203,12 +203,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "核算项目编号",
+      label: "金蝶编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "核算项目名称",
+      label: "金蝶名称",
     },
   ];
 });

src/views/product/material/index.vue

@@ -102,20 +102,20 @@
                 <el-row>
                   <el-col :span="8">
                     <el-form-item prop="length" label-width="0px" class="margin-b-0 wid100">
-                      <el-input-number v-model="formData.data.length" placeholder="请输入" style="width: 100%" :precision="2" :controls="false" :min="0"
-                                       onmousewheel="return false;" />
+                      <el-input-number v-model="formData.data.length" placeholder="请输入长（cm）" style="width: 100%" :precision="2" :controls="false"
+                                       :min="0" onmousewheel="return false;" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item prop="width" label-width="0px" class="margin-b-0 wid100">
-                      <el-input-number v-model="formData.data.width" placeholder="请输入" style="width: 100%" :precision="2" :controls="false" :min="0"
-                                       onmousewheel="return false;" />
+                      <el-input-number v-model="formData.data.width" placeholder="请输入宽（cm）" style="width: 100%" :precision="2" :controls="false"
+                                       :min="0" onmousewheel="return false;" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item prop="height" label-width="0px" class="margin-b-0 wid100">
-                      <el-input-number v-model="formData.data.height" placeholder="请输入" style="width: 100%" :precision="2" :controls="false" :min="0"
-                                       onmousewheel="return false;" />
+                      <el-input-number v-model="formData.data.height" placeholder="请输入高（cm）" style="width: 100%" :precision="2" :controls="false"
+                                       :min="0" onmousewheel="return false;" />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -242,7 +242,7 @@ const rules = ref({
   length: [{ required: true, message: "请输入长 （cm）", trigger: "blur" }],
   width: [{ required: true, message: "请输入宽 （cm）", trigger: "blur" }],
   height: [{ required: true, message: "请输入高 （cm）", trigger: "blur" }],
-  price: [{ required: true, message: "请输入销售价", trigger: "blur" }],
+  // price: [{ required: true, message: "请输入销售价", trigger: "blur" }],
 });
 
 const selectConfig = computed(() => []);

src/views/systemTenant/otherManage/artCopyright/index.vue

@@ -195,12 +195,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "核算项目编号",
+      label: "金蝶编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "核算项目名称",
+      label: "金蝶名称",
     },
   ];
 });

src/views/systemTenant/otherManage/contractor/index.vue

@@ -202,12 +202,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "核算项目编号",
+      label: "金蝶编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "核算项目名称",
+      label: "金蝶名称",
     },
   ];
 });

src/views/systemTenant/otherManage/patentManage/index.vue

@@ -195,12 +195,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "核算项目编号",
+      label: "金蝶编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "核算项目名称",
+      label: "金蝶名称",
     },
   ];
 });

src/views/systemTenant/otherManage/trademarkManage/index.vue

@@ -195,12 +195,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "核算项目编号",
+      label: "金蝶编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "核算项目名称",
+      label: "金蝶名称",
     },
   ];
 });

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

@@ -211,12 +211,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "核算项目编号",
+      label: "金蝶编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "核算项目名称",
+      label: "金蝶名称",
     },
 
     // {

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

@@ -34,6 +34,15 @@
           </div>
         </template>
 
+        <template #roles="{ item }">
+          <div style="width: 100%">
+            <span v-for="(role,index) in item.sysRoleList" :key="role.roleId">
+              {{role.roleName}}
+              <span v-if="index < item.sysRoleList.length-1">,</span>
+            </span>
+          </div>
+        </template>
+
         <template #status="{item}">
           <div style="width:100%">
             <span :style="{color:item.status==1?'red':''}">{{item.status==1?'停用':'启用'}}</span>
@@ -176,7 +185,7 @@ const config = computed(() => {
         label: "部门",
         prop: "deptName",
         slot: "deptName",
-        "min-width": 150,
+        width: 250,
       },
     },
     {
@@ -204,9 +213,16 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "角色",
+        slot: "roles",
+        "min-width": 120,
+      },
+    },
+    {
+      attrs: {
         label: "系统用户",
         prop: "userType",
-        width: 100,
+        width: 80,
       },
       render(userType) {
         return userType == 1 ? "是" : "否";
@@ -217,7 +233,7 @@ const config = computed(() => {
         label: "账号状态",
         prop: "status",
         slot: "status",
-        width: 100,
+        width: 80,
       },
       render(status) {
         return status == 1 ? "停用" : "启用";
@@ -227,7 +243,7 @@ const config = computed(() => {
       attrs: {
         label: "手机号",
         prop: "phonenumber",
-        width: 180,
+        width: 150,
       },
     },
     {
@@ -464,6 +480,18 @@ const formConfig = computed(() => {
 
     {
       type: "input",
+      prop: "jdSubjectCode",
+      label: "金蝶编号",
+      itemWidth: 50,
+    },
+    {
+      type: "input",
+      prop: "jdSubjectName",
+      label: "金蝶名称",
+      itemWidth: 50,
+    },
+    {
+      type: "input",
       prop: "accountBank",
       label: "开户行",
       placeholder: "请输入开户行",