功能提交

src/views/warehouse/receiptDoc.vue

@@ -380,6 +380,12 @@
                     <ElTableColumn
                     <ElTableColumn
                       show-overflow-tooltip
                       show-overflow-tooltip
                       align="center"
                       align="center"
+                      label="所属用户"
+                      prop="userMark"
+                    />
+                    <ElTableColumn
+                      show-overflow-tooltip
+                      align="center"
                       width="240"
                       width="240"
                       label="备注"
                       label="备注"
                       prop="remark"
                       prop="remark"
@@ -448,6 +454,12 @@
     :close-on-click-modal="false"
     :close-on-click-modal="false"
   >
   >
     <div class="import-dialog">
     <div class="import-dialog">
+      <div class="label" style="margin-bottom: 10px">
+        <span style="margin-right: 10px">所属客户：</span>
+        <el-select v-model="importUserMark" size="small" style="width: 100px;">
+          <el-option v-for="user in userMarkList" :key="user.userId" :label="user.userMark" :value="user.userId"></el-option>
+        </el-select>
+      </div>
       <div class="import-content">
       <div class="import-content">
         <UploadExcel
         <UploadExcel
           v-model="importedFileUrl"
           v-model="importedFileUrl"
@@ -462,7 +474,7 @@
   <ElDialog
   <ElDialog
     v-model="newDialogVisible"
     v-model="newDialogVisible"
     :title="formId ? '编辑' : '新增'"
     :title="formId ? '编辑' : '新增'"
-    width="80%"
+    width="85%"
     :close-on-click-modal="false"
     :close-on-click-modal="false"
   >
   >
     <div class="dialog-form">
     <div class="dialog-form">
@@ -538,6 +550,7 @@
         <ElTableColumn
         <ElTableColumn
           show-overflow-tooltip
           show-overflow-tooltip
           align="center"
           align="center"
+          width="140"
           label="库存SKU"
           label="库存SKU"
           prop="warehouseSku"
           prop="warehouseSku"
         />
         />
@@ -545,6 +558,7 @@
         <ElTableColumn
         <ElTableColumn
           show-overflow-tooltip
           show-overflow-tooltip
           align="center"
           align="center"
+          width="160"
           label="商品名称"
           label="商品名称"
           prop="skuName"
           prop="skuName"
         />
         />
@@ -605,9 +619,15 @@
           </template>
           </template>
         </ElTableColumn>
         </ElTableColumn>
         <ElTableColumn
         <ElTableColumn
+          align="center"
+          width="100"
+          label="所属客户"
+          prop="userMark"
+        />
+        <ElTableColumn
           show-overflow-tooltip
           show-overflow-tooltip
           align="center"
           align="center"
-          width="240"
+          width="140"
           label="备注"
           label="备注"
           prop="remark"
           prop="remark"
         >
         >
@@ -1037,6 +1057,7 @@ function getStartTime() {
 const selectSku = ref('')
 const selectSku = ref('')
 const userMark = ref(0)
 const userMark = ref(0)
 const batchUserMark = ref(0)
 const batchUserMark = ref(0)
+const importUserMark = ref(0)
 const treeData = ref<InterWarehouseTree[]>()
 const treeData = ref<InterWarehouseTree[]>()
 const [searchForm, resetSearchForm] = useValue<warehouseSearchForm>({})
 const [searchForm, resetSearchForm] = useValue<warehouseSearchForm>({})
 
 
@@ -1269,11 +1290,11 @@ const handleLocalImport = async ({
     const target = locationList.value.find((item: InterProductList) => {
     const target = locationList.value.find((item: InterProductList) => {
       return item.locationCode == importedItem?.locationCode
       return item.locationCode == importedItem?.locationCode
     })
     })
-    const item = userMarkList.value.find(e=>e.userId===userMark.value)
+    const item = userMarkList.value.find(e=>e.userId===importUserMark.value)
     return {
     return {
-      customerId:userMark.value !== 0 ?userMark.value : null,
-      customerName: userMark.value !== 0 ? item?.userName || '' : null,
-      userMark: userMark.value !== 0 ? item?.userMark : null,
+      customerId:importUserMark.value !== 0 ?importUserMark.value : null,
+      customerName: importUserMark.value !== 0 ? item?.userName || '' : null,
+      userMark: importUserMark.value !== 0 ? item?.userMark : null,
       skuImage: skuItem.skuImage,
       skuImage: skuItem.skuImage,
       warehouseSku: skuItem.warehouseSku,
       warehouseSku: skuItem.warehouseSku,
       skuName: skuItem.productName,
       skuName: skuItem.productName,
@@ -1724,13 +1745,13 @@ const submitPurchase = async () => {
     ElMessage.warning('请输入库存 SKU')
     ElMessage.warning('请输入库存 SKU')
     return
     return
   }
   }
-  const item = userMarkList.value.find(e=>e.userId===userMark.value)
+  const item = userMarkList.value.find(e=>e.userId===batchUserMark.value)
   const filteredSkusList = await batchAddCommodity(purchaseTextarea.value)
   const filteredSkusList = await batchAddCommodity(purchaseTextarea.value)
   const mergedProductList = filteredSkusList.map((skuItem) => {
   const mergedProductList = filteredSkusList.map((skuItem) => {
     return {
     return {
-      customerId:userMark.value !== 0 ?userMark.value : null,
-      customerName: userMark.value !== 0 ? item?.userName || '' : null,
-      userMark: userMark.value !== 0 ? item?.userMark : null,
+      customerId:batchUserMark.value !== 0 ?batchUserMark.value : null,
+      customerName: batchUserMark.value !== 0 ? item?.userName || '' : null,
+      userMark: batchUserMark.value !== 0 ? item?.userMark : null,
       skuImage: skuItem.skuImage,
       skuImage: skuItem.skuImage,
       warehouseSku: skuItem.warehouseSku,
       warehouseSku: skuItem.warehouseSku,
       skuName: skuItem.productName,
       skuName: skuItem.productName,
@@ -1760,6 +1781,7 @@ const importedFileUrl = ref('')
 const importData = async () => {
 const importData = async () => {
   importDialogVisible.value = true
   importDialogVisible.value = true
   importedFileUrl.value = ''
   importedFileUrl.value = ''
+  importUserMark.value = 0
 }
 }
 const handleBatchDelete = async () => {
 const handleBatchDelete = async () => {
   if (!selections.value.length) {
   if (!selections.value.length) {