工序

src/BIZComponents/autogenerateDialog.vue

@@ -19,7 +19,6 @@
             :needPage="false"
             :columns="generatePurchaseColumns"
             :max-height="300"
-            :toolkit="[]"
             :selection.sync="selection"
             :datasource="form.generatePurchaseTable"
             cache-key="generatePurchaseListTable17"

src/BIZComponents/inventoryTable.vue

@@ -4,7 +4,7 @@
       ref="table"
       :needPage="false"
       :columns="columns"
-      :toolkit="[]"
+
       :datasource="form.datasource"
       cache-key="systemRoleTable17"
       class="time-form"
@@ -556,7 +556,26 @@
       <template v-slot:headerPricingWay="{ column }">
         <span class="is-required">{{ column.label }}</span>
       </template>
-
+      <template v-slot:taskName="scope">
+        <el-form-item
+          style="margin-bottom: 20px"
+          :prop="'datasource.' + scope.$index + '.taskName'"
+        >
+          <el-input
+            v-model="scope.row.taskName"
+            placeholder="请选择"
+            style="width: 60%; margin-right: 10px"
+            disabled
+          ></el-input>
+          <el-button
+            v-if="scope.row.productCode"
+            size="small"
+            type="primary"
+            @click.native="handleTaskinstance(scope.row, scope.$index)"
+            >选择
+          </el-button>
+        </el-form-item>
+      </template>
       <!-- 操作列 -->
       <template v-slot:action="scope">
         <el-popconfirm
@@ -585,6 +604,12 @@
       ref="versionRefs"
       @changeProduct="changeProduct"
     ></ProductionVersion>
+    <taskinstance-dialog
+      ref="taskinstanceDialogRef"
+      v-if="taskinstanceDialogFlag"
+      @saveTaskInstance="saveTaskInstance"
+      :visible.sync="taskinstanceDialogFlag"
+    ></taskinstance-dialog>
   </el-form>
 </template>
 <script>
@@ -601,6 +626,7 @@
   import { pricingWayList,lbjtList } from '@/enum/dict.js';
   import { changeCount } from '@/BIZComponents/setProduct.js';
   import { contactQueryByCategoryIdsAPI } from '@/api/saleManage/contact';
+  import taskinstanceDialog from '@/BIZComponents/procedure/taskinstanceDialog.vue';
   const dayjs = require('dayjs');
 
   export default {
@@ -610,7 +636,8 @@
       productList,
       fileUpload,
       headList,
-      ProductionVersion
+      ProductionVersion,
+      taskinstanceDialog
     },
     props: {
       pageName: {
@@ -710,6 +737,7 @@
         technicalDrawings: []
       };
       return {
+        taskinstanceDialogFlag:false,
         allPrice: 0,
         numberReg,
         defaultForm,
@@ -774,15 +802,13 @@
             headerSlot: 'headerCustomerMark',
             align: 'center'
           },
-          // {
-          //   width: 200,
-          //   prop: 'supplierMark',
-          //   label: '供应商代号',
-          //   slot: 'supplierMark',
-          //   headerSlot: 'headerSupplierMark',
-          //   align: 'center',
-          //   show: this.contractBookType == 2
-          // },
+          {
+            minWidth: 240,
+            prop: 'taskName',
+            label: '工序',
+            slot: 'taskName',
+            align: 'center'
+          },
           {
             minWidth: 120,
             prop: 'entrustedEnterpriseId',
@@ -1072,6 +1098,21 @@
         );
         this.$set(this.form.datasource[index], 'technologyRouteId', data.id);
       },
+      handleTaskinstance(row, index) {
+        this.taskinstanceDialogFlag = true;
+        this.$nextTick(() => {
+          this.$refs.taskinstanceDialogRef.open(row, index);
+        });
+      },
+      saveTaskInstance(row = {}) {
+        this.$set(this.form.datasource[row.index], 'taskId', row.id);
+        this.$set(this.form.datasource[row.index], 'taskName', row.name);
+        this.$set(
+          this.form.datasource[row.index],
+          'routingId',
+          row.produceRoutingId
+        );
+      },
       async getSupplierObj(productList, queryName) {
         try {
           let categoryIds = productList

src/BIZComponents/inventoryTableDetails.vue

@@ -4,7 +4,6 @@
       ref="table"
       :needPage="false"
       :columns="columns"
-      :toolkit="[]"
       :datasource="form.datasource"
       cache-key="systemRoleTable17"
       class="time-form"
@@ -161,15 +160,13 @@
             align: 'center'
             // show: this.contractBookType == 1
           },
-          // {
-          //   width: 200,
-          //   prop: 'supplierMark',
-          //   label: '供应商代号',
-          //   slot: 'supplierMark',
-          //   headerSlot: 'headerSupplierMark',
-          //   align: 'center',
-          //   show: this.contractBookType == 2
-          // },
+          {
+            minWidth: 240,
+            prop: 'taskName',
+            label: '工序',
+            slot: 'taskName',
+            align: 'center'
+          },
           {
             minWidth: 120,
             prop: 'entrustedEnterpriseId',

src/BIZComponents/saleGeneralityInventoryTable.vue

@@ -4,7 +4,6 @@
       ref="table"
       :needPage="false"
       :columns="columns"
-      :toolkit="[]"
       :datasource="form.datasource"
       cache-key="systemRoleTable17"
       class="time-form"

src/views/contractManage/contractBook/components/detailDialog.vue

@@ -229,7 +229,6 @@
         ref="table"
         :needPage="false"
         :columns="receiptPaymentListcolumns"
-        :toolkit="[]"
         :datasource="detailData.receiptPaymentList"
         row-key="id"
       >

src/views/contractManage/contractBook/components/detailDialog1.vue

@@ -225,7 +225,6 @@
         ref="table"
         :needPage="false"
         :columns="receiptPaymentListcolumns"
-        :toolkit="[]"
         :datasource="detailData.receiptPaymentList"
         row-key="id"
       >

src/views/contractManage/contractBook/components/inventoryTable.vue

@@ -4,7 +4,6 @@
       ref="table"
       :needPage="false"
       :columns="columns"
-      :toolkit="[]"
       max-height="500px"
       :datasource="form.datasource"
       cache-key="systemRoleTable17"

src/views/contractManage/contractBook/components/inventoryTabledetail.vue

@@ -3,7 +3,6 @@
     ref="table"
     :needPage="false"
     :columns="competAnalysisListcolumns"
-    :toolkit="[]"
     :datasource="productList"
     row-key="id"
   >

src/views/financialManage/components/feeRelatedInfoTable.vue

@@ -7,7 +7,6 @@
         :columns="columns"
         :datasource="form.datasource"
         :needPage="false"
-        :toolkit="[]"
         :minHeight="100"
         tool-class="ele-toolbar-form"
         cache-key="eomContactPageTable"

src/views/financialManage/invoiceManage/components/purchasingAccountTable.vue

@@ -29,7 +29,7 @@
         <div  v-for="(j,i) in item.subList" :key="i">
           <ele-pro-table :show-summary="true" :summary-method="getSummaries" ref="table" row-key="id" :needPage="false"
                          :columns="getColumns(j)" max-height="500px" style="margin-bottom: 10px"
-                         :sub-title="subTypeList[j.subType]+j.statementSubOrderCode" :toolkit="[]" :datasource="j.detailList"
+                         :sub-title="subTypeList[j.subType]+j.statementSubOrderCode"  :datasource="j.detailList"
                          cache-key="systemRoleTable17-11121" class="time-form">
 
           </ele-pro-table>

src/views/financialManage/invoiceManage/components/saleAccountTable.vue

@@ -33,7 +33,7 @@
             <ele-pro-table :show-summary="true" :summary-method="getSummaries" ref="table" row-key="id"
                            :needPage="false"
                            :columns="getColumns(j)" max-height="500px" style="margin-bottom: 10px"
-                           :sub-title="subTypeList[j.subType]+j.statementSubOrderCode" :toolkit="[]"
+                           :sub-title="subTypeList[j.subType]+j.statementSubOrderCode" 
                            :datasource="j.detailList"
                            cache-key="systemRoleTable17-11121" class="time-form">
             </ele-pro-table>
@@ -43,7 +43,7 @@
           <ele-pro-table :show-summary="true" :summary-method="getSummaries" ref="table" row-key="id" :needPage="false"
                          :columns="getColumns({subType:10})" sub-title="赔付订单" max-height="500px"
                          style="margin-bottom: 10px"
-                         :toolkit="[]" :datasource="item.detailList"
+                          :datasource="item.detailList"
                          cache-key="systemRoleTable17-11121" class="time-form">
           </ele-pro-table>
         </div>

src/views/financialManage/invoiceManage/components/tableInfo.vue

@@ -4,7 +4,6 @@
       ref="table"
       :needPage="false"
       :columns="columns"
-      :toolkit="[]"
       :datasource="tableForm.detailList"
       row-key="id"
     >

src/views/financialManage/payableManage/components/infoTable.vue

@@ -18,7 +18,6 @@
         :columns="columns"
         :datasource="dialogForm.detailList"
         :needPage="false"
-        :toolkit="[]"
         :minHeight="100"
         tool-class="ele-toolbar-form"
         cache-key="collectionDialogTable"

src/views/financialManage/payableManage/components/infoTable1.vue

@@ -18,7 +18,6 @@
         :columns="columns"
         :datasource="dialogForm.detailList"
         :needPage="false"
-        :toolkit="[]"
         :minHeight="100"
         tool-class="ele-toolbar-form"
         cache-key="collectionDialogTable"

src/views/financialManage/receivableManage/components/infoTable.vue

@@ -18,7 +18,6 @@
         :columns="columns"
         :datasource="dialogForm.detailList"
         :needPage="false"
-        :toolkit="[]"
         :minHeight="100"
         tool-class="ele-toolbar-form"
         cache-key="collectionDialogTable"

src/views/financialManage/receivableManage/components/infoTable1.vue

@@ -18,7 +18,6 @@
         :columns="columns"
         :datasource="dialogForm.detailList"
         :needPage="false"
-        :toolkit="[]"
         :minHeight="100"
         tool-class="ele-toolbar-form"
         cache-key="collectionDialogTable"

src/views/home/index.vue

@@ -81,7 +81,6 @@
               ref="table"
               :columns="columns"
               :need-page="false"
-              :toolkit="[]"
               style="padding: 10px"
               height="calc(28.5vh)"
               :datasource="datasource"
@@ -101,7 +100,6 @@
               ref="table"
               :columns="columns"
               :need-page="false"
-              :toolkit="[]"
               style="padding: 10px"
               height="calc(28.5vh)"
               :datasource="datasource"

src/views/marketManagem/components/taskInfoTable.vue

@@ -7,7 +7,6 @@
         :columns="columns"
         :datasource="form.datasource"
         :needPage="false"
-        :toolkit="[]"
         :minHeight="100"
         tool-class="ele-toolbar-form"
         cache-key="eomContactPageTable"

src/views/purchasingManage/inquiryManage/components/detailDialog.vue

@@ -86,7 +86,6 @@
         ref="table"
         :needPage="false"
         :columns="columns"
-        :toolkit="[]"
         :datasource="form.detailList"
         row-key="id"
       >

src/views/purchasingManage/inquiryManage/components/inquiryTable.vue

@@ -4,7 +4,6 @@
       ref="table"
       :needPage="false"
       :columns="columns"
-      :toolkit="[]"
       max-height="500px"
       :span-method="objectSpanMethod"
       :datasource="form.resultList"

src/views/purchasingManage/inquiryManage/components/inventoryTable.vue

@@ -4,7 +4,6 @@
       ref="table"
       :needPage="false"
       :columns="columns"
-      :toolkit="[]"
       max-height="500px"
       :datasource="form.datasource"
       cache-key="systemRoleTable17"

src/views/purchasingManage/producerManage/components/addContactDialog.vue

@@ -264,7 +264,6 @@
           :columns="bankColumns"
           :datasource="tableBankData"
           height="350px"
-          :toolkit="[]"
           :need-page="false"
         >
           <!-- 表头工具栏 -->
@@ -317,7 +316,6 @@
           ref="linkTable"
           :columns="linkColumns"
           :datasource="tableLinkData"
-          :toolkit="[]"
           height="350px"
           :need-page="false"
         >
@@ -525,7 +523,6 @@
           :columns="supplyColumns"
           :need-page="false"
           :datasource="supplyList"
-          :toolkit="[]"
           height="350px"
         >
           <!-- 表头工具栏 -->
@@ -555,7 +552,6 @@
           :columns="certificateColumns"
           :need-page="false"
           :datasource="tableCertificateData"
-          :toolkit="[]"
           height="350px"
         >
           <!-- 表头工具栏 -->

src/views/purchasingManage/producerManage/components/certificateQualificationsDialog.vue

@@ -58,7 +58,7 @@
             </el-col>
           </el-row>
           <headerTitle title="资质信息"/>
-          <ele-pro-table ref="linkTable" :columns="columns" :datasource="form.detailsList" :toolkit="[]" height="300px"
+          <ele-pro-table ref="linkTable" :columns="columns" :datasource="form.detailsList"  height="300px"
                          :need-page="false">
             <!-- 表头工具栏 -->
             <template v-slot:toolbar>

src/views/purchasingManage/producerManage/components/contactDetailDialog.vue

@@ -155,7 +155,6 @@
           :columns="bankColumns"
           :datasource="tableBankData"
           height="350px"
-          :toolkit="[]"
           :need-page="false"
         >
           <template v-slot:accountNameHeader="{ column }">
@@ -180,7 +179,6 @@
           ref="linkTable"
           :columns="linkColumns"
           :datasource="tableLinkData"
-          :toolkit="[]"
           height="350px"
           :need-page="false"
         >
@@ -308,13 +306,13 @@
         <headerTitle title="生产列表" style="margin-top: 30px"></headerTitle>
         <ele-pro-table ref="supplyRef" :columns="supplyColumns" :need-page="false"
                        :datasource="supplyList"
-                       :toolkit="[]" height="350px">
+                       height="350px">
         </ele-pro-table>
       </el-tab-pane>
       <el-tab-pane label="证书资质" name="certificate">
         <headerTitle title="证书资质" style="margin-top: 30px"></headerTitle>
         <ele-pro-table ref="certificateTable" :columns="certificateColumns"  :needPage="false"  :datasource="tableCertificateData"
-                       :toolkit="[]" height="350px">
+                        height="350px">
           <!-- 操作栏 -->
           <template v-slot:action="scope">
             <el-link

src/views/purchasingManage/purchaseNeedManage/components/detailDialog.vue

@@ -127,7 +127,6 @@
         ref="table"
         :needPage="false"
         :columns="columns"
-        :toolkit="[]"
         :max-height="500"
         :datasource="detailData.detailList"
         row-key="id"

src/views/purchasingManage/purchaseNeedManage/components/inventoryTable.vue

@@ -4,7 +4,6 @@
       ref="table"
       :needPage="false"
       :columns="columns"
-      :toolkit="[]"
       max-height="500px"
       :datasource="form.datasource"
       cache-key="systemRoleTable17"

src/views/purchasingManage/purchaseOrder/accountstatement/components/inventoryTable.vue

@@ -34,7 +34,6 @@
             max-height="500px"
             style="margin-bottom: 10px"
             :sub-title="subTypeList[j.subType] + j.statementSubOrderCode"
-            :toolkit="[]"
             :datasource="j.detailList"
             cache-key="systemRoleTable17-11121"
             class="time-form"

src/views/purchasingManage/purchaseOrder/components/billDetailDialog.vue

@@ -13,7 +13,6 @@
       ref="table"
       :needPage="false"
       :columns="columns"
-      :toolkit="[]"
       max-height="500px"
       :datasource="datasource"
       :span-method="objectSpanMethod"

src/views/saleManage/saleOrder/invoice/components/detailDialog.vue

@@ -121,7 +121,6 @@
             ref="table"
             :needPage="false"
             :columns="competAnalysisListcolumns"
-            :toolkit="[]"
             :datasource="detailData.productList"
             row-key="id"
           >
@@ -156,7 +155,6 @@
                   max-height="300px"
                   :needPage="false"
                   :columns="childrenColumns"
-                  :toolkit="[]"
                   :datasource="scope.row.sendProductDetail"
                   cache-key="stockLedgerRoleTable"
                   class="time-form"

src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -4,7 +4,6 @@
       ref="table"
       :needPage="false"
       :columns="columns"
-      :toolkit="[]"
       :datasource="form.datasource"
       cache-key="systemRoleTable17"
       class="time-form"
@@ -64,7 +63,6 @@
               :selection.sync="selection"
               :needPage="false"
               :columns="childrenColumns"
-              :toolkit="[]"
               :datasource="scope.row.sendProductDetail"
               cache-key="stockLedgerRoleTable"
               class="time-form"

src/views/saleManage/saleOrder/invoice/components/taskInfoTable.vue

@@ -7,7 +7,6 @@
         :columns="columns"
         :datasource="form.datasource"
         :needPage="false"
-        :toolkit="[]"
         :minHeight="100"
         tool-class="ele-toolbar-form"
         cache-key="eomContactPageTable"

src/views/saleManage/saleOrder/invoiceConfirm/components/detailDialog.vue

@@ -99,7 +99,6 @@
             ref="table"
             :needPage="false"
             :columns="columns"
-            :toolkit="[]"
             :datasource="form.productList"
             row-key="id"
           >
@@ -110,7 +109,6 @@
             ref="table"
             :needPage="false"
             :columns="trayListColumns"
-            :toolkit="[]"
             :datasource="trayListData"
             row-key="id"
           >

src/views/saleManage/saleOrder/palletManagement/components/detailDialog.vue

@@ -21,7 +21,6 @@
       ref="table"
       :needPage="false"
       :columns="trayListColumns"
-      :toolkit="[]"
       :datasource="trayListData"
       row-key="id"
     >

src/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog.vue

@@ -162,7 +162,6 @@
         ref="table"
         :needPage="false"
         :columns="oldColumns"
-        :toolkit="[]"
         :datasource="productList"
         row-key="id"
       >

src/views/saleManage/saleOrder/returnGoods/components/customerReturnOrderDetail.vue

@@ -7,7 +7,6 @@
         ref="table"
         :needPage="false"
         :columns="columns"
-        :toolkit="[]"
         :datasource="datasource"
         cache-key="customerReturnOrderDialog"
         class="time-form"

src/views/saleManage/saleOrder/returnGoods/components/customerReturnOrderDialog.vue

@@ -36,7 +36,6 @@
           ref="table"
           :needPage="false"
           :columns="columns"
-          :toolkit="[]"
           :datasource="form.detailList"
           cache-key="customerReturnOrderDialog"
           class="time-form"

src/views/saleManage/saleOrder/returnGoods/components/detailDialog.vue

@@ -131,7 +131,6 @@
         ref="table"
         :needPage="false"
         :columns="oldColumns"
-        :toolkit="[]"
         :datasource="productList"
         row-key="id"
       >
@@ -147,7 +146,6 @@
         :needPage="false"
         :columns="competAnalysisListcolumns"
         v-show="!['40', '50'].includes(form.type) || form.returnSourceType != 1"
-        :toolkit="[]"
         :datasource="detailData.productList"
         row-key="id"
       >

src/views/saleManage/saleOrder/returnGoods/components/inventoryTable.vue

@@ -4,7 +4,6 @@
       ref="table"
       :needPage="false"
       :columns="columns"
-      :toolkit="[]"
       :datasource="form.datasource"
       cache-key="systemRoleTable17"
       class="time-form"