111

src/components/jimureport/browseModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <span>
     <ele-modal
       :visible.sync="showEditFlag"
       :close-on-click-modal="false"
@@ -12,7 +12,7 @@
     ></ele-modal>
     <!-- <el-link type="primary" @click="open">{{ text }}</el-link> -->
     <el-link v-if="!browseShow" type="primary" @click="open">{{ text }}</el-link>
-  </div>
+  </span>
 </template>
 
 <script>

src/views/contractManage/contractBook/index.vue

@@ -122,6 +122,8 @@
                 >
                   新增发票
                 </el-link>
+
+                <jimureport v-if="[2].includes(row.status)" :businessId="row.id" businessCode="erpcontractprint" style="margin-left: 5px;"></jimureport>
                 <el-popconfirm
                   v-if="
                     (isNeed_process_is_close && [0, 3].includes(row.status)) ||
@@ -197,6 +199,8 @@
   import addDialog from './components/addDialog.vue';
   import detailDialog from './components/detailDialog.vue';
   import popModal from '@/components/pop-modal';
+  import jimureport from '@/components/jimureport/browseModal.vue';
+
   import AssetTree from '@/components/AssetTree';
   import { reviewStatus } from '@/enum/dict';
   import { contactTypeTree } from '@/api/saleManage/contact';
@@ -204,7 +208,6 @@
   import supplierAddDialog from '@/views/purchasingManage/purchaseOrder/components/addDialog.vue';
   import { submit as saleOrderSubmitAPI } from '@/api/saleManage/saleorder';
   import tabMixins from '@/mixins/tableColumnsMixin';
-
   import {
     getTableList,
     submit,
@@ -227,7 +230,7 @@
       detailDialog,
       saleOrderAddDialog,
       supplierAddDialog,
-      addInvoiceManage
+      addInvoiceManage,jimureport
     },
     //客户管理数据
     props: {
@@ -425,7 +428,7 @@
           {
             columnKey: 'action',
             label: '操作',
-            width: 230,
+            width: 250,
             align: 'center',
             resizable: false,
             slot: 'action',
@@ -449,7 +452,8 @@
         if (node.level != 1) {
           this.curNodeData = data;
           this.curNodeData.level = node.level;
-          this.curNodeData['parentCode'] = node.level==3?node.parent.data.code:'';
+          this.curNodeData['parentCode'] =
+            node.level == 3 ? node.parent.data.code : '';
         }
 
         this.reload({ categoryId: data.id });
@@ -536,7 +540,6 @@
               businessType: res.categoryName,
               businessCode: res.contractNumber,
               businessName: res.contractName
-
             }
           };
           this.$refs.processSubmitDialogRef.init(params);

src/views/purchasingManage/purchasePlanManage/components/splitDialog.vue

@@ -249,6 +249,7 @@
         :toolkit="[]"
         style="margin-bottom: 10px"
         :datasource="item.detailList"
+        :selection.sync="selection[index]"
         row-key="id"
       >
         <template v-slot:totalCount="{ row }">
@@ -405,6 +406,7 @@
         historyForm: {},
         splitFormList: [],
         rules: {},
+        selection: [],
         columns: [
           {
             width: 45,
@@ -437,6 +439,21 @@
             align: 'center',
             showOverflowTooltip: true
           },
+          {
+            minWidth: 100,
+            label: '状态',
+            fixed: 'left',
+            formatter: (row, column) => {
+              return row.isInquiry == 1
+                ? '部分核价'
+                : row.isInquiry == 2
+                ? '全部核价完成'
+                : row.isInquiry == 3
+                ? '核价中'
+                : '未核价';
+            },
+            align: 'center'
+          },
           {
             minWidth: 150,
             prop: 'totalCount',
@@ -444,6 +461,12 @@
             slot: 'totalCount',
             align: 'center'
           },
+          {
+            width: 150,
+            prop: 'inquiryNum',
+            label: '已核价数量',
+            align: 'center'
+          },
           {
             width: 100,
             prop: 'measuringUnit',
@@ -485,6 +508,12 @@
           { label: '分批到货', value: 2 }
         ],
         splitColumns: [
+          {
+            width: 45,
+            type: 'selection',
+            columnKey: 'selection',
+            align: 'center'
+          },
           {
             width: 45,
             type: 'index',
@@ -634,16 +663,32 @@
         )?.totalCount;
         count += row.totalCount;
         this.setFormCount(row.id, count);
+
         if (this.splitFormList[formIndex].detailList.length == 0) {
-          this.handleMerge(formIndex);
+          this.handleMerge(formIndex,'delAll');
         }
       },
-      handleMerge(index) {
+      handleMerge(index,type) {
+        if (this.selection[index]?.length&&type!='delAll') {
+          this.selectionDel(index);
+          return;
+        }
         this.splitFormList.splice(index, 1);
         if (this.splitFormList.length == 0) {
           this.form = this.historyForm;
         }
       },
+      selectionDel(index) {
+        this.selection[index].forEach((item) => {
+          let i = this.splitFormList[index].detailList.findIndex(
+            (val) => val.id == item.id
+          );
+          if (i != '-1') {
+            this.handleRemove(index, i, item);
+          }
+        });
+        console.log(this.selection[index], 'this.selection[index]');
+      },
       openStaffSelection(index) {
         this.$refs.staffSelection.open(
           this.form.responsibleName

src/views/purchasingManage/purchasePlanManage/index.vue

@@ -210,8 +210,7 @@
                 v-if="
                   [2].includes(row.status) &&
                   !row.isCut &&
-                  !(row.inquiryCount * 1)&&
-                  [0, 100, 101,103].includes(row.progress)
+                  [0, 100, 101, 103].includes(row.progress)
                 "
                 @click="handleSplit(row)"
               >
@@ -237,7 +236,7 @@
                   [2].includes(row.status) &&
                   (!row.isCut || (row.parentId && row.parentId != 0)) &&
                   isAddInquiry != 0 &&
-                  [0, 100, 101,103].includes(row.progress)
+                  [0, 100, 101, 103].includes(row.progress)
                 "
                 icon="el-icon-plus"
                 @click="addInquiry('add', row)"

src/views/saleManage/saleOrder/index.vue

@@ -162,7 +162,7 @@
                   :underline="false"
                   icon="el-icon-plus"
                   @click="handleCommand('saleOrderReminder', row)"
-                  v-if="[2].includes(row.orderStatus)"
+                  v-if="[2].includes(row.orderStatus)&&clientEnvironmentId!=5"
                 >
                   催单
                 </el-link>