Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt into dengfei

src/views/bpm/documents/noticeIssuance/components/addOrEdit.vue

@@ -197,7 +197,7 @@ export default {
                 const y = e.clientY - rect.top + body.scrollTop;
 
                 let w = 200, h = 200;
-                if (data.sealType === 'private') { w = 210; h = 70; }
+                if (data.sealType === 'private') { w = 210; h = 'auto'; }
 
                 const imgHtml = `<img src="${data.url}" class="seal-drag-img"
                   style="position:absolute;left:${Math.max(0, x)}px;top:${Math.max(0, y)}px;width:${w}px;height:${h}px;cursor:move;z-index:10;"

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

@@ -175,11 +175,11 @@
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               label="计量数量"
               prop="measureQuantity"
               :show-overflow-tooltip="true"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               label="调拨数量"
               prop="quantity"

src/views/bpm/outgoingManagement/details.vue

@@ -122,8 +122,8 @@
               {{ row.minPackingQuantity }} {{ row.measureUnit }} /{{ row.packingUnit }}
             </template>
             <!-- 单价列 -->
-            <template v-if="isPrice == 1" v-slot:price="{ row }">
-              {{ row.price ? row.price : ' ' + '元' }}/{{ row.measureUnit }}
+            <template v-if="isPrice == 1" v-slot:singlePrice="{ row }">
+              {{ row.singlePrice ? row.singlePrice : ' ' + '元' }}/{{ row.measureUnit }}
             </template>
             <!-- 金额列 -->
             <template v-if="isPrice == 1" v-slot:totalMoney="{ row }">
@@ -633,9 +633,9 @@
         if (this.isPrice == 1) {
           columns.push({
             label: '单价',
-            prop: 'price',
+            prop: 'singlePrice',
             align: 'center',
-            slot: 'price'
+            slot: 'singlePrice'
           });
         }
         

src/views/bpm/processInstance/detailNew.vue

@@ -81,7 +81,7 @@
                 </label>
 
                 <p v-if="item.reason && item.result != 4">
-                  <el-tag :type="getTimelineItemType(item)">{{
+                  审批意见：<el-tag :type="getTimelineItemType(item)">{{
                     item.reason
                   }}</el-tag>
                 </p>