修改

src/BIZComponents/product-list.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog
+  <ele-modal
     title="选择产品"
     :visible.sync="visible"
     v-if="visible"
@@ -150,7 +150,7 @@
       ref="cBomRef"
       @changeParent="getSelectionCbom"
     ></c-bom-list>
-  </el-dialog>
+  </ele-modal>
 </template>
 
 <script>

src/BIZComponents/selectStockLedger/selectStockLedgerDialog.vue

@@ -8,6 +8,8 @@
     :close-on-press-escape="false"
     append-to-body
     width="70%"
+    :maxable="true"
+    :resizable="true"
   >
     <el-card shadow="never">
       <item-search @search="reload" ref="refSeavch"></item-search>

src/components/addDoc/file-table-listTemplate.vue

@@ -6,10 +6,10 @@
       :columns="columns"
       :datasource="datasource"
       tool-class="ele-toolbar-form"
-      :needPage="false"
       row-key="id"
       :selection.sync="selection"
       :toolbar="false"
+      height="600px"
     >
       <!-- 操作列 -->
       <template v-slot:action="{ row }">
@@ -28,172 +28,176 @@
 </template>
 
 <script>
-import { filePageAPI } from './api';
-import browse from './browse.vue';
+  import { filePageAPI } from './api';
+  import browse from './browse.vue';
 
-export default {
-  components: { browse },
-  props: {
-    // 上级
-    parentData: {
-      type: Object,
-      default: () => {}
+  export default {
+    components: { browse },
+    props: {
+      // 上级
+      parentData: {
+        type: Object,
+        default: () => {}
+      },
+
+      disabledTableList: {
+        //已选择列表
+        default: () => []
+      }
     },
 
-    disabledTableList: {
-      //已选择列表
-      default: () => []
-    }
-  },
+    data() {
+      return {
+        selection: [],
+        columns: [
+          {
+            width: 45,
+            type: 'selection',
+            columnKey: 'selection',
+            align: 'center',
+            reserveSelection: true,
+            selectable: (row, index) => {
+              return !this.disabledTableList
+                .map((item) => item.id)
+                .includes(row.id);
+            }
+          },
+          {
+            label: '编码',
+            prop: 'code',
+            width: 180,
+            align: 'center',
+            fixed: 'left',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'name',
+            label: '文档名称',
+            align: 'center',
+            slot: 'name',
+            showOverflowTooltip: true,
+            minWidth: 200
+          },
+          {
+            prop: 'storagePath',
+            label: '文件名称',
+            align: 'center',
 
-  data() {
-    return {
-      selection: [],
-      columns: [
-        {
-          width: 45,
-          type: 'selection',
-          columnKey: 'selection',
-          align: 'center',
-          selectable: (row, index) => {
-            return !this.disabledTableList
-              .map((item) => item.id)
-              .includes(row.id);
-          }
-        },
-        {
-          label: '编码',
-          prop: 'code',
-          width: 180,
-          align: 'center',
-          fixed: 'left',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'name',
-          label: '文档名称',
-          align: 'center',
-          slot: 'name',
-          showOverflowTooltip: true,
-          minWidth: 200
-        },
-        {
-          prop: 'storagePath',
-          label: '文件名称',
-          align: 'center',
-
-          showOverflowTooltip: true,
-          minWidth: 200,
-          formatter: (_row, _column, cellValue) => {
-            return cellValue[0]?.name;
-          }
-        },
-        {
-          prop: 'version',
-          label: '版本',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 100
-        },
-        {
-          prop: 'checkOutUserName',
-          label: '检出人',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 100
-        },
-        {
-          prop: 'checkOutStatus',
-          label: '检出状态',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 100,
-          formatter: (_row, _column, cellValue) => {
-            return cellValue == 1 ? '已检出' : '';
+            showOverflowTooltip: true,
+            minWidth: 200,
+            formatter: (_row, _column, cellValue) => {
+              return cellValue[0]?.name;
+            }
+          },
+          {
+            prop: 'version',
+            label: '版本',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 100
+          },
+          {
+            prop: 'checkOutUserName',
+            label: '检出人',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 100
+          },
+          {
+            prop: 'checkOutStatus',
+            label: '检出状态',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 100,
+            formatter: (_row, _column, cellValue) => {
+              return cellValue == 1 ? '已检出' : '';
+            }
+          },
+          {
+            prop: 'checkOutTime',
+            label: '检出时间',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 160
+          },
+          {
+            prop: 'createUserName',
+            label: '创建人',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 100
+          },
+          {
+            prop: 'createTime',
+            label: '创建时间',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 160,
+            formatter: (_row, _column, cellValue) => {
+              return this.$util.toDateString(cellValue);
+            }
+          },
+          {
+            prop: 'updateUserName',
+            label: '修改人',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 100
+          },
+          {
+            prop: 'updateTime',
+            label: '修改时间',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 160
+          },
+          {
+            prop: 'sizeUnit',
+            label: '文档大小',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 100
+          },
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 150,
+            align: 'center',
+            resizable: false,
+            slot: 'action',
+            showOverflowTooltip: true,
+            fixed: 'right'
           }
-        },
-        {
-          prop: 'checkOutTime',
-          label: '检出时间',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 160
-        },
-        {
-          prop: 'createUserName',
-          label: '创建人',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 100
-        },
-        {
-          prop: 'createTime',
-          label: '创建时间',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 160,
-          formatter: (_row, _column, cellValue) => {
-            return this.$util.toDateString(cellValue);
-          }
-        },
-        {
-          prop: 'updateUserName',
-          label: '修改人',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 100
-        },
-        {
-          prop: 'updateTime',
-          label: '修改时间',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 160
-        },
-        {
-          prop: 'sizeUnit',
-          label: '文档大小',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 100
-        },
-        {
-          columnKey: 'action',
-          label: '操作',
-          width: 150,
-          align: 'center',
-          resizable: false,
-          slot: 'action',
-          showOverflowTooltip: true,
-          fixed: 'right'
-        }
-      ]
-    };
-  },
-  created() {},
-
-  methods: {
-    /* 表格数据源 */
-    datasource({ page, limit, where, order }) {
-      return filePageAPI({
-        ...where,
-        ...order,
-        pageNum: page,
-        size: limit,
-        directoryId: this.parentData?.id
-      });
-    },
-    /* 刷新表格 */
-    reload(where) {
-      this.$refs.table.reload({ pageNum: 1, where: where });
+        ]
+      };
     },
+    created() {},
 
-    browseOpen(row) {
-      this.$refs.browseRef.open(row);
-    },
-    getTableList() {
-      return JSON.parse(JSON.stringify(this.selection));
+    methods: {
+      /* 表格数据源 */
+      datasource({ page, limit, where, order }) {
+        return filePageAPI({
+          ...where,
+          ...order,
+          pageNum: page,
+          size: limit,
+          directoryId: this.parentData?.id
+        });
+      },
+      /* 刷新表格 */
+      reload(where) {
+        this.$refs.table.reload({ pageNum: 1, where: where });
+      },
+
+      browseOpen(row) {
+        this.$refs.browseRef.open(row);
+      },
+      getTableList() {
+        return JSON.parse(JSON.stringify(this.selection));
+      },
+      setSelectedRows(data) {
+        this.$refs.table.setSelectedRows(data);
+      }
     }
-  }
-};
+  };
 </script>

src/components/addDoc/main.vue

@@ -212,6 +212,7 @@ export default {
         return;
       }
       this.tableList.push(...list);
+      this.$refs.doc_templateRef.$refs.tableRef.setSelectedRows([])
     }
   }
 };

src/public-path.js

@@ -1,11 +1,11 @@
 (function () {
   if (window.__POWERED_BY_QIANKUN__) {
-    if (process.env.NODE_ENV === 'development') {
-      // eslint-disable-next-line
-      __webpack_public_path__ = `//localhost:8080/eom/`;
-      console.log('__webpack_public_path__', __webpack_public_path__);
-      return;
-    }
+    // if (process.env.NODE_ENV === 'development') {
+    //   // eslint-disable-next-line
+    //   __webpack_public_path__ = `//localhost:${process.env.VUE_APP_PORT}/`;
+    //   console.log('__webpack_public_path__', __webpack_public_path__);
+    //   return;
+    // }
     // eslint-disable-next-line
     __webpack_public_path__ = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
     // __webpack_public_path__ = `${process.env.BASE_URL}/`

src/views/home/index.vue

@@ -108,7 +108,7 @@
         indexGroup().then((res) => {
           console.log(res, 'res');
           this.barOption = barOption(
-            res.saleAndPurchaseGroup.monthName,
+            res.saleAndPurchaseGroup?.monthName,
             [
               {
                 name: '采购',
@@ -133,19 +133,19 @@
             ],
           );
           this.barOption1 = barOption(
-            res.payableAndReceivableGroup.monthName,
+            res.payableAndReceivableGroup?.monthName,
             [
               {
                 name: '应收',
                 barWidth: '25%',
-                data: res.payableAndReceivableGroup.receivableCounts,
+                data: res.payableAndReceivableGroup?.receivableCounts,
                 type: 'bar',
                 yAxisIndex: 0 // 使用第一个Y轴
               },
               {
                 name: '应付',
                 barWidth: '25%',
-                data: res.payableAndReceivableGroup.payableCounts,
+                data: res.payableAndReceivableGroup?.payableCounts,
                 type: 'bar',
                 yAxisIndex: 0 // 使用第一个Y轴
               }

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

@@ -469,64 +469,64 @@
             slot: 'weightUnit',
             align: 'center'
           },
-          {
-            width: 160,
-            prop: 'pricingWay',
-            label: '计价方式',
-            slot: 'pricingWay',
-            align: 'center',
-            formatter: (row, column) => {
-              return row.pricingWay == 1
-                ? '按数量计费'
-                : row.pricingWay == 2
-                ? '按重量计费'
-                : '';
-            }
-          },
-          {
-            width: 160,
-            prop: 'singlePrice',
-            label: '单价',
-            slot: 'singlePrice',
-            align: 'center'
-          },
-          {
-            width: 120,
-            prop: 'taxRate',
-            label: '税率',
-            formatter: (_row, _column, cellValue) => {
-              return _row.taxRate ? _row.taxRate + '%' : '';
-            },
-            align: 'center'
-          },
-          {
-            width: 180,
-            prop: 'notaxSinglePrice',
-            label: '不含税单价',
-            slot: 'notaxSinglePrice',
-            align: 'center'
-          },
-          {
-            width: 160,
-            prop: 'discountSinglePrice',
-            label: '折后单价',
-            slot: 'discountSinglePrice',
-            align: 'center'
-          },
-          {
-            width: 120,
-            prop: 'totalPrice',
-            label: '合计',
-            slot: 'totalPrice',
-            align: 'center'
-          },
-          {
-            width: 120,
-            prop: 'discountTotalPrice',
-            label: '折后合计',
-            slot: 'discountTotalPrice',
-            align: 'center'
-          },
+          // {
+          //   width: 160,
+          //   prop: 'pricingWay',
+          //   label: '计价方式',
+          //   slot: 'pricingWay',
+          //   align: 'center',
+          //   formatter: (row, column) => {
+          //     return row.pricingWay == 1
+          //       ? '按数量计费'
+          //       : row.pricingWay == 2
+          //       ? '按重量计费'
+          //       : '';
+          //   }
+          // },
+          // {
+          //   width: 160,
+          //   prop: 'singlePrice',
+          //   label: '单价',
+          //   slot: 'singlePrice',
+          //   align: 'center'
+          // },
+          // {
+          //   width: 120,
+          //   prop: 'taxRate',
+          //   label: '税率',
+          //   formatter: (_row, _column, cellValue) => {
+          //     return _row.taxRate ? _row.taxRate + '%' : '';
+          //   },
+          //   align: 'center'
+          // },
+          // {
+          //   width: 180,
+          //   prop: 'notaxSinglePrice',
+          //   label: '不含税单价',
+          //   slot: 'notaxSinglePrice',
+          //   align: 'center'
+          // },
+          // {
+          //   width: 160,
+          //   prop: 'discountSinglePrice',
+          //   label: '折后单价',
+          //   slot: 'discountSinglePrice',
+          //   align: 'center'
+          // },
+          // {
+          //   width: 120,
+          //   prop: 'totalPrice',
+          //   label: '合计',
+          //   slot: 'totalPrice',
+          //   align: 'center'
+          // },
+          // {
+          //   width: 120,
+          //   prop: 'discountTotalPrice',
+          //   label: '折后合计',
+          //   slot: 'discountTotalPrice',
+          //   align: 'center'
+          // },
           {
             prop: 'provenance',
             label: '产地',

src/views/purchasingManage/purchaseOrder/outSourceSend/components/addOrEditDialog.vue

@@ -89,12 +89,7 @@
         <el-col :span="12">
           <el-form-item prop="sendFiles" label="附件">
             <fileMain v-model="form.files"></fileMain>
-            <!--            <fileUpload-->
-            <!--              v-model="form.files"-->
-            <!--              module="main"-->
-            <!--              :showLib="false"-->
-            <!--              :limit="10"-->
-            <!--            />-->
+      
           </el-form-item>
         </el-col>
         <el-col :span="12"> </el-col>

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

@@ -151,6 +151,26 @@
       <template v-slot:headerWarehouseId="{ 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
@@ -172,6 +192,12 @@
       :isGetInventoryTotal="true"
       @changeParent="changeParent"
     ></product-list>
+    <taskinstance-dialog
+      ref="taskinstanceDialogRef"
+      v-if="taskinstanceDialogFlag"
+      @saveTaskInstance="saveTaskInstance"
+      :visible.sync="taskinstanceDialogFlag"
+    ></taskinstance-dialog>
   </el-form>
 </template>
 <script>
@@ -183,6 +209,7 @@
     getWarehouseOutStock,
     getIdWarehouseList
   } from '@/api/saleManage/saleorder';
+  import taskinstanceDialog from '@/BIZComponents/procedure/taskinstanceDialog.vue';
 
   import tabMixins from '@/mixins/tableColumnsMixin';
   import { getFile } from '@/api/system/file';
@@ -202,7 +229,7 @@
     },
     components: {
       fileMain,
-      productList
+      productList,taskinstanceDialog
     },
     data() {
       const defaultForm = {
@@ -223,6 +250,7 @@
         allPrice: 0.0,
         numberReg,
         defaultForm,
+        taskinstanceDialogFlag:false,
         warehouseList: [],
         form: {
           datasource: []
@@ -352,7 +380,7 @@
           //   slot: 'orderTotalCount'
           // },
           {
-            minWidth: 150,
+            minWidth: 300,
             prop: 'taskName',
             label: '工序',
             slot: 'taskName',
@@ -618,7 +646,12 @@
           warehouseOutStock
         );
       },
-
+      handleTaskinstance(row, index) {
+        this.taskinstanceDialogFlag = true;
+        this.$nextTick(() => {
+          this.$refs.taskinstanceDialogRef.open(row, index);
+        });
+      },
       //修改数量更新合计
       changeNum(val, row, index) {
         this.$set(
@@ -730,7 +763,15 @@
           }
         });
       },
-
+      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
+        );
+      },
       validateTotalCount(row) {
         return (rule, value, callback) => {
           if (isNaN(value) || Number(value) <= 0) {

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

@@ -652,70 +652,70 @@
             slot: 'weightUnit',
             align: 'center'
           },
-          {
-            width: 160,
-            prop: 'pricingWay',
-            label: '计价方式',
-            slot: 'pricingWay',
-            align: 'center',
-            formatter: (row, column) => {
-              return row.pricingWay == 1
-                ? '按数量计费'
-                : row.pricingWay == 2
-                ? '按重量计费'
-                : '';
-            }
-          },
-          {
-            width: 180,
-            prop: 'singlePrice',
-            label: '单价',
-            slot: 'singlePrice',
-            align: 'center'
-          },
-          {
-            width: 160,
-            prop: 'taxRate',
-            label: '税率',
-            formatter: (_row, _column, cellValue) => {
-              return _row.taxRate ? _row.taxRate + '%' : '';
-            },
-            align: 'center'
-          },
-          {
-            width: 180,
-            prop: 'notaxSinglePrice',
-            label: '不含税单价',
-            slot: 'notaxSinglePrice',
-            align: 'center'
-          },
-          {
-            width: 160,
-            prop: 'discountSinglePrice',
-            label: '折后单价',
-            slot: 'discountSinglePrice',
-            align: 'center'
-          },
-          {
-            width: 120,
-            prop: 'totalPrice',
-            label: '合计',
-            slot: 'totalPrice',
-            align: 'center'
-          },
+          // {
+          //   width: 160,
+          //   prop: 'pricingWay',
+          //   label: '计价方式',
+          //   slot: 'pricingWay',
+          //   align: 'center',
+          //   formatter: (row, column) => {
+          //     return row.pricingWay == 1
+          //       ? '按数量计费'
+          //       : row.pricingWay == 2
+          //       ? '按重量计费'
+          //       : '';
+          //   }
+          // },
+          // {
+          //   width: 180,
+          //   prop: 'singlePrice',
+          //   label: '单价',
+          //   slot: 'singlePrice',
+          //   align: 'center'
+          // },
+          // {
+          //   width: 160,
+          //   prop: 'taxRate',
+          //   label: '税率',
+          //   formatter: (_row, _column, cellValue) => {
+          //     return _row.taxRate ? _row.taxRate + '%' : '';
+          //   },
+          //   align: 'center'
+          // },
+          // {
+          //   width: 180,
+          //   prop: 'notaxSinglePrice',
+          //   label: '不含税单价',
+          //   slot: 'notaxSinglePrice',
+          //   align: 'center'
+          // },
+          // {
+          //   width: 160,
+          //   prop: 'discountSinglePrice',
+          //   label: '折后单价',
+          //   slot: 'discountSinglePrice',
+          //   align: 'center'
+          // },
+          // {
+          //   width: 120,
+          //   prop: 'totalPrice',
+          //   label: '合计',
+          //   slot: 'totalPrice',
+          //   align: 'center'
+          // },
           // {
           //   width: 160,
           //   prop: 'notaxTotalPrice',
           //   label: '含税合计',
           //   align: 'center'
           // },
-          {
-            width: 120,
-            prop: 'discountTotalPrice',
-            label: '折后合计',
-            slot: 'discountTotalPrice',
-            align: 'center'
-          },
+          // {
+          //   width: 120,
+          //   prop: 'discountTotalPrice',
+          //   label: '折后合计',
+          //   slot: 'discountTotalPrice',
+          //   align: 'center'
+          // },
           {
             width: 80,
             prop: 'deliveryDays',

src/views/saleManage/saleOrder/invoiceConfirm/index.vue

@@ -119,7 +119,6 @@
                 </el-link>
               </template>
             </el-popconfirm>
-    
           </template>
         </ele-pro-table>
       </div>
@@ -175,7 +174,7 @@
   import tabMixins from '@/mixins/tableColumnsMixin';
 
   export default {
-    mixins: [dictMixins,tabMixins],
+    mixins: [dictMixins, tabMixins],
     components: {
       processSubmitDialog,
       printTemplate,
@@ -331,7 +330,7 @@
             fixed: 'right'
           }
         ],
-        cacheKeyUrl:'eos-436e7400-saleManage-invoiceConfirm',
+        cacheKeyUrl: 'eos-436e7400-saleManage-invoiceConfirm'
       };
     },
     computed: {},