部分bug修改

src/components/byForm/index.vue

@@ -107,10 +107,10 @@
           </slot>
 
           <div class="upload" v-else-if="i.type == 'upload'">
-            <el-upload :file-list="formData[i.prop]" :action="uploadUrl" :data="uploadData" :list-type="i.listType ? i.listType : 'text'"
-                       :accept="i.accept?i.accept :''" :limit="i.limit?i.limit:3" :before-upload="(file)=>handleBeforeUpload(file,i)"
-                       :on-success="()=>handleSuccess(i)" :on-remove="(file)=>handleRemove(file,i)" :on-exceed="()=>handleExceed(i)"
-                       :on-preview="onPreviewFile">
+            <el-upload :file-list="formData[i.prop]?formData[i.prop]:[]" :action="uploadUrl" :data="uploadData"
+                       :list-type="i.listType ? i.listType : 'text'" :accept="i.accept?i.accept :''" :limit="i.limit?i.limit:3"
+                       :before-upload="(file)=>handleBeforeUpload(file,i)" :on-success="()=>handleSuccess(i)"
+                       :on-remove="(file)=>handleRemove(file,i)" :on-exceed="()=>handleExceed(i)" :on-preview="onPreviewFile">
 
               <el-icon v-if="i.listType=='picture-card'">
                 <Plus />

src/components/process/PurchasePayment.vue

@@ -19,7 +19,7 @@
 
       <template #payDetailList>
         <div style="width: 100%">
-          <el-button type="primary" @click="clickAdd()">添加行</el-button>
+          <el-button type="primary" @click="clickAdd()" v-if="!judgeStatus()">添加行</el-button>
           <el-table :data="formData.data.payDetailList" style="width: 100%; margin-top: 16px">
             <el-table-column label="采购合同" width="220">
               <template #default="{ row, $index }">
@@ -54,7 +54,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="80">
+            <el-table-column label="操作" width="80" v-if="!judgeStatus()">
               <template #default="{ row, $index }">
                 <el-button type="primary" link @click="handleRemove($index)">删除</el-button>
               </template>
@@ -491,6 +491,7 @@ onMounted(async () => {
         for (const key in res) {
           formData.data[key] = res[key];
         }
+        formData.data.fileList = [];
         if (
           formData.data.payDetailList &&
           formData.data.payDetailList.length > 0

src/views/EHSD/procurement/purchasedEHSD/index.vue

@@ -170,13 +170,6 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "版本号",
-        prop: "version",
-        width: 100,
-      },
-    },
-    {
-      attrs: {
         label: "采购人",
         prop: "userName",
         width: 140,
@@ -213,7 +206,7 @@ const config = computed(() => {
       attrs: {
         label: "操作",
         width: 160,
-        align: "center",
+        align: "right",
         fixed: "right",
       },
       renderHTML(row) {

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

@@ -693,18 +693,18 @@ const config = computed(() => {
           //     handleEditTag(row);
           //   },
           // },
-          // {
-          //   attrs: {
-          //     label: "售后",
-          //     type: "primary",
-          //     text: true,
-          //   },
-          //   el: "button",
-          //   click() {
-          //     openRecords.value = true;
-          //     getRecordsData(row);
-          //   },
-          // },
+          {
+            attrs: {
+              label: "售后",
+              type: "primary",
+              text: true,
+            },
+            el: "button",
+            click() {
+              openRecords.value = true;
+              getRecordsData(row);
+            },
+          },
         ];
       },
     },

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

@@ -319,15 +319,15 @@ const formConfig = computed(() => {
       itemType: "text",
       itemWidth: 50,
     },
-    {
-      type: "title1",
-      title: "账户余额",
-    },
-    {
-      type: "slot",
-      slotName: "balance",
-      label: "账户余额",
-    },
+    // {
+    //   type: "title1",
+    //   title: "账户余额",
+    // },
+    // {
+    //   type: "slot",
+    //   slotName: "balance",
+    //   label: "账户余额",
+    // },
   ];
 });
 const rules = ref({
@@ -382,32 +382,47 @@ const isRepeat = (arr) => {
 };
 const submitForm = () => {
   submit.value.handleSubmit(() => {
-    if (
-      formData.data.accountRemainderList &&
-      formData.data.accountRemainderList.length > 0
-    ) {
-      if (isRepeat(formData.data.accountRemainderList)) {
-        return ElMessage("请勿重复添加货币余额");
-      } else {
-        loadingDialog.value = true;
-        proxy.post("/accountManagement/" + modalType.value, formData.data).then(
-          () => {
-            ElMessage({
-              message: modalType.value == "add" ? "添加成功" : "编辑成功",
-              type: "success",
-            });
-            dialogVisible.value = false;
-            getList();
-          },
-          (err) => {
-            console.log(err);
-            loadingDialog.value = false;
-          }
-        );
+    loadingDialog.value = true;
+    proxy.post("/accountManagement/" + modalType.value, formData.data).then(
+      () => {
+        ElMessage({
+          message: modalType.value == "add" ? "添加成功" : "编辑成功",
+          type: "success",
+        });
+        dialogVisible.value = false;
+        getList();
+      },
+      (err) => {
+        console.log(err);
+        loadingDialog.value = false;
       }
-    } else {
-      return ElMessage("请添加至少一条账户余额");
-    }
+    );
+    // if (
+    //   formData.data.accountRemainderList &&
+    //   formData.data.accountRemainderList.length > 0
+    // ) {
+    //   if (isRepeat(formData.data.accountRemainderList)) {
+    //     return ElMessage("请勿重复添加货币余额");
+    //   } else {
+    //     loadingDialog.value = true;
+    //     proxy.post("/accountManagement/" + modalType.value, formData.data).then(
+    //       () => {
+    //         ElMessage({
+    //           message: modalType.value == "add" ? "添加成功" : "编辑成功",
+    //           type: "success",
+    //         });
+    //         dialogVisible.value = false;
+    //         getList();
+    //       },
+    //       (err) => {
+    //         console.log(err);
+    //         loadingDialog.value = false;
+    //       }
+    //     );
+    //   }
+    // } else {
+    //   return ElMessage("请添加至少一条账户余额");
+    // }
   });
 };
 const update = (row) => {

src/views/index.vue

@@ -13,57 +13,62 @@
           </div>
         </li>
         <li class="theme2" @click="toUrl(2)">
-          <div class="num">{{ haveInitiatedData.total }}</div>
+          <div class="num">{{ allData[0].total }}</div>
           <div class="label">待报价</div>
           <div class="icon-box">
             <svg-icon :icon-class="'baojia'" className="svg-class1" />
           </div>
         </li>
         <li class="theme3" @click="toUrl(3)">
-          <div class="num">{{ pushInfo.total }}</div>
+          <div class="num">{{ allData[0].total }}</div>
           <div class="label">待投产</div>
           <div class="icon-box">
             <svg-icon :icon-class="'touchang'" className="svg-class" />
           </div>
         </li>
         <li class="theme4" @click="toUrl(4)">
-          <div class="num">{{ pushInfo.total }}</div>
+          <div class="num">{{ allData[2].total }}</div>
           <div class="label">待入库</div>
           <div class="icon-box">
             <svg-icon :icon-class="'ruku'" className="svg-class1" />
           </div>
         </li>
         <li class="theme5" @click="toUrl(5)">
-          <div class="num">{{ pushInfo.total }}</div>
+          <div class="num">{{ allData[3].total }}</div>
           <div class="label">待出库</div>
           <div class="icon-box">
             <svg-icon :icon-class="'chuku'" className="svg-class1" />
           </div>
         </li>
-        <li class="theme6" @click="toUrl(6)">
-          <div class="num">{{ pushInfo.total }}</div>
+        <li class="theme6" @click="toUrl(6)" v-if="useUserStore().user.companyId =='100'">
+          <div class="num">{{ allData[4].total }}</div>
           <div class="label">待认领</div>
           <div class="icon-box">
             <svg-icon :icon-class="'renling'" className="svg-class1" />
           </div>
         </li>
+        <li class="theme6" @click="toUrl(6)" v-else>
+          <div class="num">{{ allData[4].total }}</div>
+          <div class="label">库存预警</div>
+          <div class="icon-box">
+            <svg-icon :icon-class="'kucun'" className="svg-class1" />
+          </div>
+        </li>
+
       </ul>
       <div class="table-card">
         <el-card style="width:32%">
           <TitleInfo :content="'待审批'"></TitleInfo>
-          <el-table :data="tableData" style="width: 100%" :height="tableHeight">
-            <el-table-column prop="date" label="Date" />
-            <el-table-column prop="name" label="Name" />
-            <el-table-column prop="address" label="Address" />
+          <el-table :data="toBeProcessedData.rows" style="width: 100%" :height="tableHeight">
+            <el-table-column prop="title" label="流程标题" />
           </el-table>
 
         </el-card>
         <el-card style="width:32%">
           <TitleInfo :content="'待报价'"></TitleInfo>
-          <el-table :data="tableData" style="width: 100%" :height="tableHeight">
-            <el-table-column prop="date" label="Date" />
-            <el-table-column prop="name" label="Name" />
-            <el-table-column prop="address" label="Address" />
+          <el-table :data="allData[0].rows" style="width: 100%" :height="tableHeight">
+            <el-table-column prop="code" label="报价单号" />
+            <el-table-column prop="amount" label="报价金额" width="110" />
           </el-table>
 
         </el-card>
@@ -81,25 +86,32 @@
       <div class="table-card ">
         <el-card style="width:32%">
           <TitleInfo :content="'待入库'"></TitleInfo>
-          <el-table :data="tableData" style="width: 100%" :height="tableHeight">
-            <el-table-column prop="date" label="Date" />
-            <el-table-column prop="name" label="Name" />
-            <el-table-column prop="address" label="Address" />
+          <el-table :data="allData[2].rows" style="width: 100%" :height="tableHeight">
+            <el-table-column prop="businessCode" label="单号" />
+            <el-table-column prop="quantity" label="数量" width="100" />
           </el-table>
 
         </el-card>
         <el-card style="width:32%">
           <TitleInfo :content="'待出库'"></TitleInfo>
-          <el-table :data="tableData" style="width: 100%" :height="tableHeight">
+          <el-table :data="allData[3].rows" style="width: 100%" :height="tableHeight">
+            <el-table-column prop="businessCode" label="单号" />
+            <el-table-column prop="quantity" label="数量" width="100" />
+          </el-table>
+
+        </el-card>
+        <el-card style="width:32%" v-if="useUserStore().user.companyId =='100'">
+          <TitleInfo :content="'待认领'"></TitleInfo>
+          <el-table :data="allData[4].rows" style="width: 100%" :height="tableHeight">
             <el-table-column prop="date" label="Date" />
             <el-table-column prop="name" label="Name" />
             <el-table-column prop="address" label="Address" />
           </el-table>
 
         </el-card>
-        <el-card style="width:32%">
-          <TitleInfo :content="'待认领'"></TitleInfo>
-          <el-table :data="tableData" style="width: 100%" :height="tableHeight">
+        <el-card style="width:32%" v-else>
+          <TitleInfo :content="'库存预警'"></TitleInfo>
+          <el-table :data="allData[4].rows" style="width: 100%" :height="tableHeight">
             <el-table-column prop="date" label="Date" />
             <el-table-column prop="name" label="Name" />
             <el-table-column prop="address" label="Address" />
@@ -130,7 +142,7 @@
           </div>
           <div class="theme3 q" @click="toUrl(7)">
             <span class="label">丢失</span>
-            <span class="num">{{ haveInitiatedData.total }}</span>
+            <span class="num">{{ toBeProcessedData.total }}</span>
           </div>
         </div>
       </el-card>
@@ -143,54 +155,8 @@
           <div style="height:190px;width:calc(100% - 100px)" ref="pie_1"></div>
         </div>
       </el-card>
-      <!-- <div class="card odd">
-        <div class="commons-title">我的待审批</div>
-        <el-table :data="toBeProcessedData.rows" style="width: 100%">
-          <el-table-column prop="flowName" label="流程类型" width="100" />
-          <el-table-column prop="title" label="流程标题" />
-          <el-table-column prop="createUserName" label="发起人" width="100" />
-          <el-table-column prop="createTime" label="发起时间" width="155" />
-          <el-table-column fixed="right" label="操作" width="60">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="pushProcessApproval(scope.row)">
-                审批
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div class="card even">
-        <div class="commons-title">业务提醒</div>
-      </div>
-      <div class="card odd">
-        <div class="commons-title">我的发起（未结束）</div>
-        <el-table :data="haveInitiatedData.rows" style="width: 100%">
-          <el-table-column prop="flowName" label="流程类型" width="100" />
-          <el-table-column prop="title" label="流程标题" />
-          <el-table-column prop="createUserName" label="审批人" width="100" />
-          <el-table-column prop="createTime" label="发起时间" width="155" />
-          <el-table-column fixed="right" label="操作" width="60">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="pushProcessApprovalOne(scope.row)">
-                查看
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div class="card even">
-        <div class="commons-title">系统公告</div>
-        <ul class="announcement">
-          <li v-for="i in sendMegData.rows" :key="i.id">
-            <div class="time">{{ i.createTime }} <span>系统公告</span></div>
-            <div class="content">{{ i.content }}</div>
-          </li>
-        </ul>
-      </div> -->
     </div>
-    <!-- <byTableDemo></byTableDemo> -->
-    <!-- <el-input type="number" v-model='aaa' v-mousewheel></el-input> -->
-    <!-- 111112132131211 -->
+
   </div>
 </template>
 
@@ -200,7 +166,7 @@ import byTableDemo from "../components/byTable/demo";
 import html2canvas from "html2canvas";
 import JsPDF from "jspdf";
 import * as echarts from "echarts";
-
+const { proxy } = getCurrentInstance();
 const tableHeight = ref(0);
 const tableHeightOne = ref(0);
 const getTableHeight = () => {
@@ -212,22 +178,26 @@ window.addEventListener("resize", () => {
   getTableHeight();
 });
 
-const aaa = ref(1);
 function goTarget(url) {
   window.open(url, "__blank");
 }
-let toBeProcessedData = ref({
-  total: 0,
-  rows: [],
-});
-let haveInitiatedData = ref({
+
+const toBeProcessedData = ref({
   total: 0,
   rows: [],
 });
-const sendMegData = ref({
-  total: 0,
-  rows: [],
+
+const allData = ref({
+  0: {
+    total: 0,
+    rows: [],
+  },
+  1: { total: 0, rows: [] },
+  2: { total: 0, rows: [] },
+  3: { total: 0, rows: [] },
+  4: { total: 0, rows: [] },
 });
+
 const pushProcessApproval = (row) => {
   if (row.status != 1 && row.status != 0) {
     proxy.$router.push({
@@ -279,46 +249,56 @@ const pushProcessApprovalOne = (row) => {
   });
   return;
 };
-const { proxy } = getCurrentInstance();
-const pushInfo = ref({
-  total: 0,
-  rows: [],
-});
 const getData = () => {
   proxy
     .post("/flowExample/getToBeProcessedPage", {
       pageNum: 1,
-      pageSize: 4,
+      pageSize: 5,
     })
     .then((res) => {
       toBeProcessedData.value = res;
     });
+  // 待报价
   proxy
-    .post("/flowExample/getHaveInitiatedPage", {
+    .post("/saleQuotation/page", {
       pageNum: 1,
-      pageSize: 4,
-      status: "1",
+      pageSize: 5,
+      isEstimate: proxy.useUserStore().user.companyId == "100" ? "" : "1",
     })
     .then((res) => {
-      haveInitiatedData.value = res;
+      allData.value[0] = res;
     });
+  // 待入库
   proxy
-    .post("pushAnnouncement/page", {
+    .post("/stockWaitDetails/page", {
       pageNum: 1,
-      pageSize: 3,
+      pageSize: 5,
+      type: 1,
     })
     .then((res) => {
-      sendMegData.value = res;
+      allData.value[2] = res;
+    });
+  // 待出库
+  proxy
+    .post("/stockWaitDetails/page", {
+      pageNum: 1,
+      pageSize: 5,
+      type: 2,
+    })
+    .then((res) => {
+      allData.value[3] = res;
     });
 
+  // 待认领
   proxy
-    .post("pushInfo/page", {
+    .post("/sale/accountRunningWater/page", {
       pageNum: 1,
-      pageSize: 3,
-      pushRead: 0,
+      pageSize: 5,
+      isClaim: "0",
+      dataType: "1",
     })
     .then((res) => {
-      pushInfo.value = res;
+      allData.value[4] = res;
     });
 };
 const toUrl = (att) => {
@@ -693,6 +673,10 @@ onMounted(() => {
 }
 .svg-class1 {
   font-size: 19px;
+  margin-top: 10px;
+}
+:deep(.el-table .cell) {
+  font-size: 12px !important;
 }
 </style>
 

src/views/process/processApproval/index.vue

@@ -426,8 +426,9 @@ const skipPage = () => {
   let pageObj = {
     subscribe_flow: "Subscribe",
     contract_flow: "Contract",
+    contract_update_flow: "Contract",
     sale_quotation_flow: "Quotation",
-    purchase_flow: "Purchased",
+    purchase_update_flow: "Purchased",
     purchase_flow: "Purchase",
     pay_flow: "Payment",
   };