cz 1 жил өмнө
parent
commit
8144511c7b

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 497 - 145
src/components/process/Contract.vue


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 478 - 190
src/components/process/PriceSheet.vue


+ 13 - 1
src/views/connect/E-mail/mail/com/mailList.vue

@@ -152,7 +152,19 @@
         </el-table-column>
         <el-table-column prop="subject" label="主题">
           <template #default="{ row, $index }">
-            <div class="contentClass" @click="handleRowClick(row, $index)">
+            <div
+              class="contentClass"
+              @click="handleRowClick(row, $index)"
+              :style="{
+                'font-weight':
+                  (row.flags && !row.flags.includes('6')) ||
+                  (row.flags !== undefined &&
+                    row.flags !== null &&
+                    row.flags === '')
+                    ? 700
+                    : '',
+              }"
+            >
               {{ row.subject }}
             </div>
           </template>

+ 280 - 102
src/views/process/processApproval/index.vue

@@ -3,45 +3,116 @@
     <div class="left-card">
       <div class="top">
         <div class="commons-title title">
-          {{ processConfig[route.query.flowKey] ?  
-            processConfig[route.query.flowKey].name + `(${processStaus[route.query.processType] || '发起'})` : "流程标题(发起)" 
+          {{
+            processConfig[route.query.flowKey]
+              ? processConfig[route.query.flowKey].name +
+                `(${processStaus[route.query.processType] || "发起"})`
+              : "流程标题(发起)"
           }}
         </div>
         <div class="line"></div>
-        <SendSubscribe ref="makeDom" @auxiliaryChange='(e) => getAuxiliaryData(e)' v-if="flowForm.flowKey == 'subscribe_flow'" :queryData="queryData.data"></SendSubscribe>
-        <SendPurchase ref="makeDom" @auxiliaryChange='(e) => getAuxiliaryData(e)' v-else-if="flowForm.flowKey == 'purchase_flow'" :queryData="queryData.data"></SendPurchase>
-        <SendFunds ref="makeDom" v-else-if="flowForm.flowKey == 'account_request_funds_flow'" :queryData="queryData.data"></SendFunds>
-        <ReturnGood ref="makeDom" v-else-if="flowForm.flowKey == 'sales_return_flow'" :queryData="queryData.data"></ReturnGood>
-        <PurchaseRefund ref="makeDom" v-else-if="flowForm.flowKey == 'refund_flow'" :queryData="queryData.data"></PurchaseRefund>
-        <PurchasePayment ref="makeDom"  @auxiliaryChange='(e) => getAuxiliaryData(e)' v-else-if="flowForm.flowKey == 'pay_flow'" :queryData="queryData.data"></PurchasePayment>
+        <SendSubscribe
+          ref="makeDom"
+          @auxiliaryChange="(e) => getAuxiliaryData(e)"
+          v-if="flowForm.flowKey == 'subscribe_flow'"
+          :queryData="queryData.data"
+        ></SendSubscribe>
+        <SendPurchase
+          ref="makeDom"
+          @auxiliaryChange="(e) => getAuxiliaryData(e)"
+          v-else-if="flowForm.flowKey == 'purchase_flow'"
+          :queryData="queryData.data"
+        ></SendPurchase>
+        <SendFunds
+          ref="makeDom"
+          v-else-if="flowForm.flowKey == 'account_request_funds_flow'"
+          :queryData="queryData.data"
+        ></SendFunds>
+        <ReturnGood
+          ref="makeDom"
+          v-else-if="flowForm.flowKey == 'sales_return_flow'"
+          :queryData="queryData.data"
+        ></ReturnGood>
+        <PurchaseRefund
+          ref="makeDom"
+          v-else-if="flowForm.flowKey == 'refund_flow'"
+          :queryData="queryData.data"
+        ></PurchaseRefund>
+        <PurchasePayment
+          ref="makeDom"
+          @auxiliaryChange="(e) => getAuxiliaryData(e)"
+          v-else-if="flowForm.flowKey == 'pay_flow'"
+          :queryData="queryData.data"
+        ></PurchasePayment>
         <template v-else-if="flowForm.flowKey == 'sale_quotation_flow'">
-          <PriceSheetEHSD ref="makeDom" v-if="flowForm.tenantType === 'EHSD'" :queryData="queryData.data"></PriceSheetEHSD>
-          <PriceSheet ref="makeDom" v-else :queryData="queryData.data"></PriceSheet>
+          <PriceSheetEHSD
+            ref="makeDom"
+            v-if="flowForm.tenantType === 'EHSD'"
+            :queryData="queryData.data"
+          ></PriceSheetEHSD>
+          <PriceSheet
+            ref="makeDom"
+            v-else
+            :queryData="queryData.data"
+          ></PriceSheet>
         </template>
         <template v-else-if="flowForm.flowKey == 'contract_flow'">
-          <ContractEHSD ref="makeDom" v-if="flowForm.tenantType === 'EHSD'" :queryData="queryData.data"></ContractEHSD>
-          <Contract ref="makeDom" v-else :queryData="queryData.data" @auxiliaryChange='(e) => getAuxiliaryData(e)'></Contract>
+          <ContractEHSD
+            ref="makeDom"
+            v-if="flowForm.tenantType === 'EHSD'"
+            :queryData="queryData.data"
+          ></ContractEHSD>
+          <Contract
+            ref="makeDom"
+            v-else
+            :queryData="queryData.data"
+            @auxiliaryChange="(e) => getAuxiliaryData(e)"
+          ></Contract>
         </template>
         <template v-else-if="flowForm.flowKey == 'contract_update_flow'">
-          <ContractAlteration ref="makeDom" :queryData="queryData.data" @auxiliaryChange='(e) => getAuxiliaryData(e)'></ContractAlteration>
+          <ContractAlteration
+            ref="makeDom"
+            :queryData="queryData.data"
+            @auxiliaryChange="(e) => getAuxiliaryData(e)"
+          ></ContractAlteration>
         </template>
         <template v-else-if="flowForm.flowKey == 'sample_flow'">
           <SampleEHSD ref="makeDom" :queryData="queryData.data"></SampleEHSD>
         </template>
         <template v-else-if="flowForm.flowKey == 'ehsd_purchase_flow'">
-          <PurchaseEHSD ref="makeDom" :queryData="queryData.data"></PurchaseEHSD>
+          <PurchaseEHSD
+            ref="makeDom"
+            :queryData="queryData.data"
+          ></PurchaseEHSD>
         </template>
 
-        <ServiceContract ref="makeDom" v-else-if="flowForm.flowKey == 'service_contract_flow'" :queryData="queryData.data"></ServiceContract>
+        <ServiceContract
+          ref="makeDom"
+          v-else-if="flowForm.flowKey == 'service_contract_flow'"
+          :queryData="queryData.data"
+        ></ServiceContract>
         <!-- 维多利亚 -->
-        <SendSubscribeWDLY ref="makeDom" v-else-if="flowForm.flowKey == 'wdly_apply_purchase'" :queryData="queryData.data"></SendSubscribeWDLY>
-        <SendPurchaseWDLY ref="makeDom" v-else-if="flowForm.flowKey == 'wdly_purchase'" :queryData="queryData.data"></SendPurchaseWDLY>
+        <SendSubscribeWDLY
+          ref="makeDom"
+          v-else-if="flowForm.flowKey == 'wdly_apply_purchase'"
+          :queryData="queryData.data"
+        ></SendSubscribeWDLY>
+        <SendPurchaseWDLY
+          ref="makeDom"
+          v-else-if="flowForm.flowKey == 'wdly_purchase'"
+          :queryData="queryData.data"
+        ></SendPurchaseWDLY>
       </div>
       <div class="bottom" v-if="route.query.processType != 20">
         <div class="commons-title title">处理意见</div>
         <el-form :model="flowForm" :rules="flowRules" ref="flowFormDom">
           <el-form-item prop="remark" label-width="0px" label="">
-            <el-input type="textarea" placeholder="请输入" v-model="flowForm.remark"> </el-input>
+            <el-input
+              type="textarea"
+              placeholder="请输入"
+              v-model="flowForm.remark"
+            >
+            </el-input>
           </el-form-item>
           <el-form-item prop="remark" label-width="80px" label="附件上传">
             <el-upload
@@ -51,13 +122,39 @@
               multiple
               :before-upload="uploadFile"
               :on-success="handleSuccess"
-              :on-preview="onPreviewFile">
+              :on-preview="onPreviewFile"
+            >
               <el-button>选择</el-button>
             </el-upload>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" v-if="approvalRecordData.buttonInfoList.length == 0" @click="handleSubmit" :loading="btnLoading">提交</el-button>
-            <el-button type="primary" v-else v-for="i in approvalRecordData.buttonInfoList" :key="i.type" :loading="btnLoading" @click="handleSubmit(i.type)">{{ i.name }}</el-button>
+            <el-button
+              type="primary"
+              v-if="approvalRecordData.buttonInfoList.length == 0"
+              @click="handleSubmit"
+              :loading="btnLoading"
+              >提交</el-button
+            >
+            <el-button
+              type="primary"
+              v-if="
+                approvalRecordData.buttonInfoList.length == 0 &&
+                StagFlowKey.includes(flowForm.flowKey)
+              "
+              @click="handleSubmitStag"
+              :loading="btnLoading"
+              >暂存</el-button
+            >
+
+            <el-button
+              type="primary"
+              v-else
+              v-for="i in approvalRecordData.buttonInfoList"
+              :key="i.type"
+              :loading="btnLoading"
+              @click="handleSubmit(i.type)"
+              >{{ i.name }}</el-button
+            >
           </el-form-item>
         </el-form>
       </div>
@@ -79,7 +176,8 @@
                   : item.status == 3 && route.query.id
                   ? 'flow-grey'
                   : ''
-              ">
+              "
+            >
               <div class="left-icon">
                 <i class="iconfont icon-iconm_daick"></i>
                 <i class="iconfont icon-icomx_quertj1 right-btm-status"></i>
@@ -88,12 +186,21 @@
                 <div class="name">{{ item.nodeName }}</div>
                 <div class="remark">
                   <div class="label">
-                    <span v-if="item.status != 3">办理人:</span>{{ item.processedUser }}<span class="time">{{ item.processedDate }}</span>
+                    <span v-if="item.status != 3">办理人:</span
+                    >{{ item.processedUser
+                    }}<span class="time">{{ item.processedDate }}</span>
                   </div>
                   {{ item.remark }}
-                  <div v-for="j in fileObj[item.flowExampleDetailId]" v-if="fileObj[item.flowExampleDetailId]">
+                  <div
+                    v-for="j in fileObj[item.flowExampleDetailId]"
+                    v-if="fileObj[item.flowExampleDetailId]"
+                  >
                     <!-- :href="j.fileUrl" -->
-                    <a  @click="proxy.download(j.fileUrl, j.fileName)" style="color:#409EFF;line-height: 30px;">{{ j.fileName }}</a>
+                    <a
+                      @click="proxy.download(j.fileUrl, j.fileName)"
+                      style="color: #409eff; line-height: 30px"
+                      >{{ j.fileName }}</a
+                    >
                   </div>
                 </div>
               </div>
@@ -101,9 +208,13 @@
             </li>
           </ul>
         </el-tab-pane>
-        <el-tab-pane label="决策辅助" name="second" v-if="auxiliaryData.length > 0">
+        <el-tab-pane
+          label="决策辅助"
+          name="second"
+          v-if="auxiliaryData.length > 0"
+        >
           <div style="overflow: auto; height: calc(100vh - 200px)">
-          <auxiliary :data="auxiliaryData"></auxiliary>
+            <auxiliary :data="auxiliaryData"></auxiliary>
           </div>
         </el-tab-pane>
       </el-tabs>
@@ -112,8 +223,18 @@
     <el-dialog title="下一处理人" width="400" v-model="dialogVisible">
       <el-form :model="flowForm">
         <el-form-item prop="remark" label="处理人">
-          <el-select v-model="flowForm.handleUserId" placeholder="请选择" filterable style="width: 100%">
-            <el-option v-for="item in nextHandleUser" :label="item.name" :value="item.id"> </el-option>
+          <el-select
+            v-model="flowForm.handleUserId"
+            placeholder="请选择"
+            filterable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in nextHandleUser"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -169,21 +290,22 @@ import SendSubscribeWDLY from "@/components/WDLY/process/SendSubscribeWDLY";
 //采购发起
 import SendPurchaseWDLY from "@/components/WDLY/process/SendPurchaseWDLY";
 import { ref } from "vue";
+const StagFlowKey = ref(["contract_flow", "sale_quotation_flow"]);
 const processConfig = ref({
-  subscribe_flow:{name:'申购'},
-  purchase_flow:{name:'采购'},
-  account_request_funds_flow:{name:'请款'},
-  sales_return_flow:{name:'退货'},
-  refund_flow:{name:'退款'},
-  pay_flow:{name:'付款'},
-  sale_quotation_flow:{name:'报价单'},
-  contract_flow:{name:'销售合同'},
-  contract_update_flow:{name:'销售合同变更'},
-  sample_flow:{name:'样品单'},
-  ehsd_purchase_flow:{name:'采购交接单'},
-  service_contract_flow:{name:'服务合同'},
-  wdly_apply_purchase:{name:'申购'},
-  wdly_purchase:{name:'采购'},
+  subscribe_flow: { name: "申购" },
+  purchase_flow: { name: "采购" },
+  account_request_funds_flow: { name: "请款" },
+  sales_return_flow: { name: "退货" },
+  refund_flow: { name: "退款" },
+  pay_flow: { name: "付款" },
+  sale_quotation_flow: { name: "报价单" },
+  contract_flow: { name: "销售合同" },
+  contract_update_flow: { name: "销售合同变更" },
+  sample_flow: { name: "样品单" },
+  ehsd_purchase_flow: { name: "采购交接单" },
+  service_contract_flow: { name: "服务合同" },
+  wdly_apply_purchase: { name: "申购" },
+  wdly_purchase: { name: "采购" },
 });
 
 const processStaus = ref({
@@ -196,11 +318,11 @@ const route = useRoute();
 // tab切换逻辑
 const activeName = ref("first");
 let auxiliaryData = ref([]);
-const getAuxiliaryData = (data)=>{
-  auxiliaryData.value=data
-}
+const getAuxiliaryData = (data) => {
+  auxiliaryData.value = data;
+};
 
-const btnLoading = ref(false)
+const btnLoading = ref(false);
 // 意见表单
 const flowForm = reactive({
   flowKey: "",
@@ -208,7 +330,7 @@ const flowForm = reactive({
   handleUserId: "",
   remark: "",
   data: {},
-  fileList:[],
+  fileList: [],
 });
 
 const uploadData = ref({});
@@ -262,9 +384,9 @@ const handleSubmit = async (_type) => {
     const flag = await makeDom.value.handleSubmit();
     if (flag) {
       flowFormDom.value.validate((valid) => {
-        btnLoading.value  = true
+        btnLoading.value = true;
         if (valid) {
-          const data = {...makeDom.value.getFormData()};
+          const data = { ...makeDom.value.getFormData() };
           if (flowForm.flowKey == "subscribe_flow") {
             // data.subscribeDetailList = data.subscribeDetailList.map((x) => ({
             //   bussinessId: x.bussinessId,
@@ -314,16 +436,18 @@ const handleSubmit = async (_type) => {
               data.ehsdJson = JSON.stringify({
                 deliveryTime: data.deliveryTime,
               });
-              data.quotationProductList = data.quotationProductList.map((item) => {
-                let ehsdJson = JSON.stringify({
-                  packMethod: item.packMethod,
-                  tradeMethods: item.tradeMethods,
-                });
-                return {
-                  ...item,
-                  ehsdJson: ehsdJson,
-                };
-              });
+              data.quotationProductList = data.quotationProductList.map(
+                (item) => {
+                  let ehsdJson = JSON.stringify({
+                    packMethod: item.packMethod,
+                    tradeMethods: item.tradeMethods,
+                  });
+                  return {
+                    ...item,
+                    ehsdJson: ehsdJson,
+                  };
+                }
+              );
             }
           } else if (flowForm.flowKey == "contract_flow") {
             if (flowForm.tenantType === "EHSD") {
@@ -352,16 +476,18 @@ const handleSubmit = async (_type) => {
               data.ehsdJson = JSON.stringify({
                 deliveryTime: data.deliveryTime,
               });
-              data.contractProductList = data.contractProductList.map((item) => {
-                let ehsdJson = JSON.stringify({
-                  packMethod: item.packMethod,
-                  tradeMethods: item.tradeMethods,
-                });
-                return {
-                  ...item,
-                  ehsdJson: ehsdJson,
-                };
-              });
+              data.contractProductList = data.contractProductList.map(
+                (item) => {
+                  let ehsdJson = JSON.stringify({
+                    packMethod: item.packMethod,
+                    tradeMethods: item.tradeMethods,
+                  });
+                  return {
+                    ...item,
+                    ehsdJson: ehsdJson,
+                  };
+                }
+              );
             }
           } else if (flowForm.flowKey == "sample_flow") {
             if (data.fileList && data.fileList.length > 0) {
@@ -403,7 +529,7 @@ const handleSubmit = async (_type) => {
           flowForm.fileList = flowForm.fileList.map((item) => {
             return {
               ...item,
-              ...item.raw
+              ...item.raw,
             };
           });
           if (route.query.processType == 10 || route.query.processType == 30) {
@@ -423,11 +549,14 @@ const handleSubmit = async (_type) => {
                 version: route.query.version,
                 flowId: route.query.id,
               })
-              .then((res) => {
-                handleResult(res);
-              },err=>{
-                 btnLoading.value  = false
-              });
+              .then(
+                (res) => {
+                  handleResult(res);
+                },
+                (err) => {
+                  btnLoading.value = false;
+                }
+              );
             return;
           } else {
             proxy
@@ -435,11 +564,57 @@ const handleSubmit = async (_type) => {
                 ...flowForm,
                 data,
               })
-              .then((res) => {
-                handleResult(res);
-              },err=>{
-                 btnLoading.value  = false
-              });
+              .then(
+                (res) => {
+                  handleResult(res);
+                },
+                (err) => {
+                  btnLoading.value = false;
+                }
+              );
+          }
+        }
+      });
+    }
+  } catch (err) {
+    console.log("数据未填完整!", err);
+  }
+};
+// 暂存
+const handleSubmitStag = async (_type) => {
+  try {
+    // 调用发起组件的提交事件
+    const flag = await makeDom.value.handleSubmit();
+    if (flag) {
+      flowFormDom.value.validate((valid) => {
+        btnLoading.value = true;
+        if (valid) {
+          const data = { ...makeDom.value.getFormData() };
+          data.dataJson = JSON.stringify(proxy.deepClone(data));
+          flowForm.fileList = flowForm.fileList.map((item) => {
+            return {
+              ...item,
+              ...item.raw,
+            };
+          });
+          if (flowForm.flowKey == "sale_quotation_flow") {
+            proxy.post("/saleQuotation/add", data).then(
+              (res) => {
+                skipPage();
+              },
+              (err) => {
+                btnLoading.value = false;
+              }
+            );
+          } else if (flowForm.flowKey == "contract_flow") {
+            proxy.post("/contract/add", data).then(
+              (res) => {
+                skipPage();
+              },
+              (err) => {
+                btnLoading.value = false;
+              }
+            );
           }
         }
       });
@@ -456,8 +631,6 @@ const skipPage = () => {
     router.replace({
       path: "/oa/1/dealWith",
     });
-    
-    
   } else {
     ElMessage({
       message: "操作成功!",
@@ -540,7 +713,7 @@ let queryData = reactive({
 // 记录
 const recordList = ref([]);
 const fileIds = ref([]);
-const fileObj = ref({}); 
+const fileObj = ref({});
 const approvalRecordData = ref({
   buttonInfoList: [],
 });
@@ -557,11 +730,13 @@ const getRecords = (_id) => {
         fileIds.value = res.recordList.map((item) => {
           return item.flowExampleDetailId;
         });
-        proxy.post('fileInfo/getList',{businessIdList:fileIds.value}).then(res2=>{
-          console.log(res2)
-          fileObj.value = res2
-        })  
-        console.log(fileObj.value)
+        proxy
+          .post("fileInfo/getList", { businessIdList: fileIds.value })
+          .then((res2) => {
+            console.log(res2);
+            fileObj.value = res2;
+          });
+        console.log(fileObj.value);
       });
   } else {
     proxy
@@ -575,10 +750,16 @@ const getRecords = (_id) => {
 };
 onMounted(async () => {
   //processType 10 为修改 20为查看 30回退发起
-  if (route.query.processType == 10 || route.query.processType == 20 || route.query.processType == 30) {
-    await proxy.post("/flowProcess/getStartData", { flowId: route.query.id }).then((res) => {
-      queryData.data = { ...res };
-    });
+  if (
+    route.query.processType == 10 ||
+    route.query.processType == 20 ||
+    route.query.processType == 30
+  ) {
+    await proxy
+      .post("/flowProcess/getStartData", { flowId: route.query.id })
+      .then((res) => {
+        queryData.data = { ...res };
+      });
   } else {
     queryData.data = { ...route.query };
   }
@@ -588,22 +769,19 @@ onMounted(async () => {
 });
 </script>
 <style>
-.el-upload-list{
+.el-upload-list {
   float: left;
-  margin: 0!important;
-  
+  margin: 0 !important;
 }
-.el-upload-list li{
-  width:100px;
+.el-upload-list li {
+  width: 100px;
   margin-left: 10px;
 }
-.el-upload--text{
+.el-upload--text {
   float: left;
 }
-
 </style>
 <style lang="scss" scoped>
-
 .processApproval {
   display: flex;
   justify-content: space-between;
@@ -624,7 +802,7 @@ onMounted(async () => {
       overflow-y: auto;
       background: #fff;
       padding: 20px 20px 0px 20px;
-      .line{
+      .line {
         border-bottom: 1px solid #ddd;
         margin-bottom: 20px;
       }

+ 71 - 33
src/views/salesMange/saleContract/contract/index.vue

@@ -38,7 +38,7 @@
         </template>
         <template #sumClaimMoney="{ item }">
           <div>
-            <el-popover :width="400" trigger="hover" @show="recordShow(item)">
+            <el-popover :width="520" trigger="hover">
               <template #reference>
                 <a
                   style="color: #409eff; cursor: pointer; word-break: break-all"
@@ -47,39 +47,55 @@
               </template>
               <template #default>
                 <div
-                  style="
-                    width: 100%;
-                    max-height: 60vh;
-                    overflow-y: auto;
-                    overflow-x: hidden;
+                  style="width: 100%; padding: 10px"
+                  v-if="
+                    item.claimContractList && item.claimContractList.length > 0
                   "
-                  v-if="item.claimRecord && item.claimRecord.length > 0"
                 >
                   <div
-                    v-for="(record, index) in item.claimRecord"
+                    v-for="(record, index) in item.claimContractList"
                     :key="index"
-                    style="margin-bottom: 20px"
+                    style="background: #f1f1f1; border-radius: 2px"
+                    :style="{
+                      'margin-bottom':
+                        index !== item.claimContractList.length - 1
+                          ? '20px'
+                          : '0px',
+                    }"
+                    :class="{ 'act-class': record.id === currentId }"
+                    @mouseenter="handleMoveEnter(record)"
                   >
-                    <div style="display: flex; justify-content: space-between">
-                      <span style="color: #909399">{{
-                        record.createTime
-                      }}</span>
-                      <span style="color: #909399">{{
-                        dictValueLabel(record.createUser, userList)
-                      }}</span>
-                    </div>
                     <div
                       style="
                         display: flex;
-                        justify-content: space-between;
-                        padding: 8px 0;
+                        justify-content: space-around;
+                        padding: 5px 0;
                       "
                     >
-                      <span
-                        >认领金额: {{ record.currency }}
-                        {{ record.money }}</span
-                      >
-                      <span>汇率: {{ record.rate }}</span>
+                      <div style="color: #333333">
+                        <div style="color: #999999; margin-bottom: 4px">
+                          认领金额:
+                        </div>
+                        {{ record.currency }} {{ record.money }}
+                      </div>
+                      <div style="color: #333333">
+                        <div style="color: #999999; margin-bottom: 4px">
+                          汇率:
+                        </div>
+                        {{ record.rate }}
+                      </div>
+                      <div style="color: #333333">
+                        <div style="color: #999999; margin-bottom: 4px">
+                          时间:
+                        </div>
+                        {{ record.createTime }}
+                      </div>
+                      <div style="color: #333333">
+                        <div style="color: #999999; margin-bottom: 4px">
+                          认领人:
+                        </div>
+                        {{ dictValueLabel(record.createUser, userList) }}
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -345,6 +361,19 @@ const config = computed(() => {
       },
       renderHTML(row) {
         return [
+          row.status == 0
+            ? {
+                attrs: {
+                  label: "修改",
+                  type: "primary",
+                  text: true,
+                },
+                el: "button",
+                click() {
+                  clickUpdate(row);
+                },
+              }
+            : {},
           !row.refundStatus && row.refundStatusNew == 10
             ? {
                 attrs: {
@@ -551,7 +580,7 @@ const newContract = () => {
     path: "/platform_manage/process/processApproval",
     query: {
       flowKey: "contract_flow",
-      flowName: "销售合同审批流程",
+      flowName: "销售合同流程发起",
       random: proxy.random(),
     },
   });
@@ -657,6 +686,17 @@ const clickAlteration = (row) => {
     },
   });
 };
+const clickUpdate = (row) => {
+  proxy.$router.replace({
+    path: "/platform_manage/process/processApproval",
+    query: {
+      flowKey: "contract_flow",
+      flowName: "销售合同流程发起",
+      contractId: row.id,
+      random: proxy.random(),
+    },
+  });
+};
 
 const getStyle = (status) => {
   if (status == 10) {
@@ -683,14 +723,9 @@ const handleClickName = (row) => {
     },
   });
 };
-const recordShow = (item) => {
-  if (!(item.claimRecord && item.claimRecord.length > 0)) {
-    proxy.post("/claimContract/getListByContractIds", [item.id]).then((res) => {
-      if (res && res.length > 0) {
-        item.claimRecord = res;
-      }
-    });
-  }
+const currentId = ref("");
+const handleMoveEnter = (item) => {
+  currentId.value = item.id;
 };
 </script>
 
@@ -711,4 +746,7 @@ const recordShow = (item) => {
   line-height: 24px;
   padding-left: 4px;
 }
+.act-class {
+  background: #eff6ff !important;
+}
 </style>

+ 25 - 0
src/views/salesMange/saleContract/priceSheet/index.vue

@@ -547,6 +547,19 @@ const config = computed(() => {
       },
       renderHTML(row) {
         return [
+          row.status == 0
+            ? {
+                attrs: {
+                  label: "修改",
+                  type: "primary",
+                  text: true,
+                },
+                el: "button",
+                click() {
+                  clickUpdate(row);
+                },
+              }
+            : {},
           {
             attrs: {
               label: "复制",
@@ -810,6 +823,18 @@ const getStyle = (status) => {
     return {};
   }
 };
+
+const clickUpdate = (row) => {
+  proxy.$router.replace({
+    path: "/platform_manage/process/processApproval",
+    query: {
+      flowKey: "sale_quotation_flow",
+      flowName: "报价审批流程",
+      priceSheetIdOne: row.id,
+      random: proxy.random(),
+    },
+  });
+};
 </script>
 
 <style lang="scss" scoped>

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно