Merge branch 'dev' into test

src/components/addDoc/seal.vue

@@ -5,7 +5,14 @@
         <!-- 右侧: 预览 & Canvas 结果 -->
         <div
           id="captureTarget"
-          style="position: fixed; left: -100000px; top: 0; width: 1240px; min-height: 1754px; background: #ffffff;"
+          style="
+            position: fixed;
+            left: -100000px;
+            top: 0;
+            width: 1240px;
+            min-height: 1754px;
+            background: #ffffff;
+          "
         >
           <div v-html="editableHtml"> </div>
         </div>
@@ -345,14 +352,21 @@
         img.onload = () => {
           console.log('图片加载成功，原始尺寸:', img.width, img.height);
 
-          // 根据签章类型设置尺寸：公用章 120x120，个人章 120x40
+          // 根据签章类型设置最大盒子尺寸，保持原图宽高比等比缩放，避免变形
+          const MAX_W = data.sealType === 'private' ? 280 : 240;
+          const MAX_H = data.sealType === 'private' ? 170 : 240;
+
+          // 原图宽高比（避免 0 除以 0，给个兜底）
+          const ratio = img.width / img.height || 1;
           let width, height;
-          if (data.sealType === 'private') {
-            width = 210;
-            height = 70;
+          if (MAX_W / MAX_H > ratio) {
+            // 盒子比原图更"宽"，以高为基准
+            height = MAX_H;
+            width = height * ratio;
           } else {
-            width = 200;
-            height = 200;
+            // 盒子比原图更"窄"（或等比），以宽为基准
+            width = MAX_W;
+            height = width / ratio;
           }
 
           const posX = x - width / 2;
@@ -372,7 +386,7 @@
             imgId: data.imgId,
             imgUrl: data.url,
             version: data.version,
-            name:data.name,
+            name: data.name,
             x: posX,
             y: posY,
             width,

src/views/bpm/handleTask/components/positionApplication/positionApplicationTable.vue

@@ -40,9 +40,6 @@
         <div>
           <span>所属机构</span><strong>{{ orgName(form) }}</strong>
         </div>
-        <div>
-          <span>所属部门</span><strong>{{ form.deptName || '-' }}</strong>
-        </div>
         <div>
           <span>岗位层级</span
           ><strong>{{ levelText(form.positionLevel) || '-' }}</strong>

src/views/bpm/handleTask/components/productionWarehousing/detailDialog.vue

@@ -73,6 +73,7 @@
         :sourceBizNo="form.code"
         :detailList="form.detailList"
         :isMoreProduct="form.type == 3 ? true : false"
+        :isTask="true"
       ></newAdd>
       <newAdd
         ref="add"
@@ -81,6 +82,7 @@
         v-if="form.code && isDetail && clientEnvironmentId != 9"
         :sourceBizNo="form.code"
         :saleProductList="form.detailList"
+        :isTask="true"
       ></newAdd>
 
       <add
@@ -91,6 +93,7 @@
         :sourceBizNo="form.code"
         :detailList="form.detailList"
         :isMoreProduct="form.type == 3 ? true : false"
+        :isTask="true"
       ></add>
       <add
         ref="add"
@@ -99,6 +102,7 @@
         v-if="form.code && isDetail && clientEnvironmentId == 9"
         :sourceBizNo="form.code"
         :saleProductList="form.detailList"
+        :isTask="true"
       ></add>
     </keep-alive>
   </div>

src/views/bpm/handleTask/components/productionWarehousing/storage.vue

@@ -136,7 +136,7 @@
       </el-form>
       <div class="inbound_details">
         <header-title title="产品信息">
-          <el-button type="primary" @click="addProduct">添加</el-button>
+          <el-button v-if="!isTask" type="primary" @click="addProduct">添加</el-button>
         </header-title>
         <div class="form_table">
           <el-form
@@ -146,7 +146,7 @@
           >
             <div style="text-align: right;margin-bottom: 10px;">
               <el-button
-                v-if="productList.length != 0"
+                v-if="productList.length != 0 && !isTask"
                 type="success"
                 plain
                 size="mini"
@@ -154,7 +154,7 @@
                 >批量保存</el-button
               >
               <el-button
-                v-if="productList.length != 0 && this.packingList.length == 0"
+                v-if="productList.length != 0 && this.packingList.length == 0 && !isTask"
                 type="success"
                 plain
                 size="mini"
@@ -343,7 +343,9 @@
 
               <!-- 仓库 -->
               <template v-slot:warehouseName="{ row, $index }">
+                <span v-if="isTask">{{ row.warehouseName }}</span>
                 <el-form-item
+                  v-else
                   :prop="'productList.' + $index + '.warehouseId'"
                   :rules="{
                     required: true,
@@ -437,7 +439,9 @@
 
               <!-- 颜色 -->
               <template v-slot:colorKey="{ row, $index }">
+                <span v-if="isTask">{{ row.colorKey }}</span>
                 <DictSelection
+                  v-else
                   dictName="物品颜色"
                   clearable
                   v-model="row.colorKey"
@@ -451,7 +455,9 @@
 
               <!-- 机型 -->
               <template v-slot:modelKey="{ row, $index }">
+                <span v-if="isTask">{{ row.modelKey }}</span>
                 <DictSelection
+                  v-else
                   dictName="物品机型"
                   clearable
                   v-model="row.modelKey"
@@ -488,7 +494,7 @@
       </div>
       <div v-if="showPackingList.length > 0" class="inbound_details">
         <header-title :title="`包装明细`">
-          <div class="switch_right">
+          <div class="switch_right" v-if="!isTask">
             <el-button
               style="margin-left: 20px"
               type="text"
@@ -1006,7 +1012,8 @@
       detailProductList: { type: Array, default: () => [] },
       isMoreProduct: { type: Boolean, default: false }, //多产品包装明细
       processInstance: { type: Object, default: () => {} },
-      isShowPackage: { type: Boolean, default: false } //售后退货单仓管审批显示
+      isShowPackage: { type: Boolean, default: false }, //售后退货单仓管审批显示
+      isTask: { type: Boolean, default: false }
     },
     data() {
       return {
@@ -1170,7 +1177,7 @@
           // 失效日期
           { label: '失效日期', prop: 'detailExpireDate', slot: 'detailExpireDate', align: 'center', width: 220 },
           // 操作
-          { label: '操作', columnKey: 'action', slot: 'action', width: 140, align: 'center', fixed: 'right' }
+          { label: '操作', columnKey: 'action', slot: 'action', width: 140, align: 'center', fixed: 'right', show: !this.isTask }
         ].filter(col => col.show !== false);
       }
     },
@@ -1746,6 +1753,7 @@
 
               return {
                 index: this.productList.length + index,
+                isSave: this.isTask || undefined,
                 categoryId: item.id, // 物品id
                 categoryName: item.name, // 物品名称
                 categoryCode: item.code, // 物品编码

src/views/bpm/handleTask/components/productionWarehousing/submit.vue

@@ -82,13 +82,6 @@
         storageData.isSkip = 1;
         storageData.workOrderCode = res.form.workOrderCode;
         console.log('storageData~~~~~~~~~~~~~~~~', storageData);
-        // return;
-        // 验证outInDetailList中是否存在数量为空的情况
-        // if (storageData.outInDetailList && storageData.outInDetailList.some(item => item.number ==undefined || item.number == '' || item.number == null)) {
-        //   this.$message.error('计量数量不为空');
-        //   return;
-        // }
-
         try {
           this.isSaveLoading = true;
           let res = await storageApi.storage(storageData);

src/views/bpm/handleTask/components/saleOrder/invoice/detailDialog.vue

@@ -406,9 +406,12 @@
             label: '发货数量',
             slot: 'saleCount',
             formatter: (row, column) => {
-              if (row.saleCount) {
+              if (row.saleCount && row.saleUnit) {
                 return row.saleCount + ' ' + row.saleUnit;
               }
+              if (row.orderProductType === 2 && row.totalCount != null) {
+                return row.totalCount + ' ' + row.measuringUnit;
+              }
             },
             headerSlot: 'headerTotalCount',
             align: 'center'
@@ -700,8 +703,13 @@
         }
       },
       getSummaries(param) {
+        const data = param.data.map((row) =>
+          row.orderProductType === 2 && (!row.saleCount || !row.saleUnit)
+            ? { ...row, saleCount: row.totalCount }
+            : row
+        );
         return getSummaries(
-          param,
+          { ...param, data },
           ['saleCount', 'blockCount', 'totalCount'],
           ' '
         );

src/views/bpm/stockManagement/storage.vue

@@ -136,7 +136,7 @@
       </el-form>
       <div class="inbound_details">
         <header-title title="产品信息">
-          <el-button type="primary" @click="addProduct">添加</el-button>
+          <el-button v-if="!isTask" type="primary" @click="addProduct">添加</el-button>
         </header-title>
         <div class="form_table">
           <el-form
@@ -146,7 +146,7 @@
           >
             <div style="text-align: right; margin-bottom: 10px">
               <el-button
-                v-if="productList.length != 0"
+                v-if="productList.length != 0 && !isTask"
                 type="success"
                 plain
                 size="mini"
@@ -154,7 +154,7 @@
                 >批量保存</el-button
               >
               <el-button
-                v-if="productList.length != 0 && this.packingList.length == 0"
+                v-if="productList.length != 0 && this.packingList.length == 0 && !isTask"
                 type="success"
                 plain
                 size="mini"
@@ -343,7 +343,9 @@
 
               <!-- 仓库 -->
               <template v-slot:warehouseName="{ row, $index }">
+                <span v-if="isTask">{{ row.warehouseName }}</span>
                 <el-form-item
+                  v-else
                   :prop="'productList.' + $index + '.warehouseId'"
                   :rules="{
                     required: true,
@@ -435,7 +437,9 @@
 
               <!-- 颜色 -->
               <template v-slot:colorKey="{ row, $index }">
+                <span v-if="isTask">{{ row.colorKey }}</span>
                 <DictSelection
+                  v-else
                   dictName="物品颜色"
                   clearable
                   v-model="row.colorKey"
@@ -449,7 +453,9 @@
 
               <!-- 机型 -->
               <template v-slot:modelKey="{ row, $index }">
+                <span v-if="isTask">{{ row.modelKey }}</span>
                 <DictSelection
+                  v-else
                   dictName="物品机型"
                   clearable
                   v-model="row.modelKey"
@@ -485,7 +491,7 @@
       </div>
       <div v-if="showPackingList.length > 0" class="inbound_details">
         <header-title :title="`包装明细`">
-          <div class="switch_right">
+          <div class="switch_right" v-if="!isTask">
             <el-button
               style="margin-left: 20px"
               type="text"
@@ -1009,7 +1015,8 @@
       detailProductList: { type: Array, default: () => [] },
       isMoreProduct: { type: Boolean, default: false }, //多产品包装明细
       processInstance: { type: Object, default: () => {} },
-      isShowPackage: { type: Boolean, default: false } //售后退货单仓管审批显示
+      isShowPackage: { type: Boolean, default: false }, //售后退货单仓管审批显示
+      isTask: { type: Boolean, default: false }
     },
     data() {
       return {
@@ -1365,7 +1372,8 @@
             slot: 'action',
             width: 140,
             align: 'center',
-            fixed: 'right'
+            fixed: 'right',
+            show: !this.isTask
           }
         ].filter((col) => col.show !== false);
       }
@@ -1841,6 +1849,7 @@
 
                 return {
                   index: this.productList.length + index,
+                  isSave: this.isTask || undefined,
                   purchaseReceiveProductId:
                     filtersItem.purchaseReceiveProductId,
                   categoryId: item.id, // 物品id

vue.config.js

@@ -38,7 +38,7 @@ module.exports = {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.105:18086',
-        // target: 'http://localhost:18086',
+        target: 'http://localhost:18090',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.3:18086',
         // target: 'http://192.168.1.251:18186',
@@ -46,7 +46,7 @@ module.exports = {
         // target: 'http://192.168.1.3:18086',
         // target: 'http://aiot.zoomwin.com.cn:51001/api',
         // target: 'http://192.168.1.3:18086',
-        target: 'http://192.168.1.147:18086', // 陈兵
+        // target: 'http://192.168.1.147:18086', // 陈兵
         // target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://192.168.1.113:18086', // 郭丹