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

src/views/bpm/handleTask/components/purchaseOrder/invoice/receiptInfo.vue

@@ -270,13 +270,13 @@
           //   headerSlot: 'headerTotalCount',
           //   align: 'center'
           // },
-          {
-            width: 120,
-            prop: 'packingSpecification',
-            align: 'center',
-            label: '包装规格',
-            showOverflowTooltip: true
-          },
+          // {
+          //   width: 120,
+          //   prop: 'packingSpecification',
+          //   align: 'center',
+          //   label: '包装规格',
+          //   showOverflowTooltip: true
+          // },
           {
             width: 80,
             prop: 'totalCount',

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

@@ -48,11 +48,8 @@
             <el-form-item label="客户收货地址：" prop="receiveAddress">
               {{ form.receiveAddress }}
             </el-form-item>
-            <!-- <el-form-item label="生产要求：" prop="productionRequirements">
-              {{ form.productionRequirements }}
-            </el-form-item> -->
-            <el-form-item prop="orderFiles" label="订单附件：">
-              <fileMain v-model="detailData.orderFiles" type="view"></fileMain>
+            <el-form-item label="是否挂单：" prop="isSuspend">
+              {{ form.isSuspend == 1 ? '是' : '否' }}
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -97,8 +94,8 @@
             <el-form-item label="应付金额：" prop="payAmount">
               {{ form.payAmount }}元
             </el-form-item>
-            <el-form-item label="订单备注：" prop="remark">
-              {{ form.remark }}
+            <el-form-item prop="orderFiles" label="订单附件：">
+              <fileMain v-model="detailData.orderFiles" type="view"></fileMain>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -142,6 +139,9 @@
             >
               {{ form.issueNumber }}期
             </el-form-item>
+            <el-form-item label="订单备注：" prop="remark">
+              {{ form.remark }}
+            </el-form-item>
           </el-col>
         </el-row>
         <headerTitle title="基本信息"></headerTitle>