yusheng 10 месяцев назад
Родитель
Сommit
d0c267001d

+ 1 - 30
src/views/bpm/handleTask/components/quotation/detailDialog.vue

@@ -72,36 +72,7 @@
         </el-col>
       </el-row>
 
-      <el-row style="margin-top: 20px">
-        <!-- <el-col :span="6">
-          <el-form-item prop="taxRate" label="税率">
-            {{ form.taxRate }}%
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item prop="deliveryDate" label="交货日期">
-            {{ form.deliveryDate?.substr(0, 10) }}
-          </el-form-item>
-        </el-col> -->
-        <!-- <el-col :span="6">
-          <el-form-item
-            label="结算方式"
-            prop="settlementMode"
-            style="margin-bottom: 22px"
-          >
-            {{ form.settlementModeName }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item
-            label="是否接受拆单"
-            prop="acceptUnpack"
-            style="margin-bottom: 22px"
-          >
-            {{ form.acceptUnpack == 1 ? '接受' : '不接受' }}
-          </el-form-item>
-        </el-col> -->
-      </el-row>
+   
     </el-form>
 
     <headerTitle title="报价单物品清单"></headerTitle>

+ 29 - 27
src/views/bpm/handleTask/components/saleOrder/detailDialog.vue

@@ -18,61 +18,63 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <headerTitle title="订单信息"> </headerTitle>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="订单编号:" prop="orderNo">
               {{ form.orderNo }}
             </el-form-item>
-            <el-form-item label="合同名称:" prop="contractName">
-              {{ form.contractName }}
-            </el-form-item>
             <el-form-item label="合同编号:" prop="contractNumber">
               {{ form.contractNumber }}
             </el-form-item>
+            <el-form-item label="订单类型:" prop="totalAmount">
+              {{
+                form.needProduce == 1
+                  ? '有客户生产性订单'
+                  : form.needProduce == 2
+                  ? '无客户生产性订单'
+                  : form.needProduce == 4
+                  ? '不定向订单'
+                  : '库存式订单'
+              }}
+            </el-form-item>
+
             <el-form-item label="结算方式:" prop="settlementModeName">
               {{ detailData.settlementModeName }}
             </el-form-item>
-            <el-form-item prop="orderFiles" label="订单附件:">
-              <fileMain v-model="detailData.orderFiles" type="view"></fileMain>
-           
-            </el-form-item>
 
             <el-form-item label="客户收货地址:" prop="receiveAddress">
               {{ form.receiveAddress }}
             </el-form-item>
-            <el-form-item label="订单备注:" prop="remark">
-              {{ form.remark }}
-            </el-form-item>
           </el-col>
-          <el-col :span="12">
-          
-
+          <el-col :span="8">
             <el-form-item label="项目名称:" prop="projectName">
               {{ form.projectName }}
             </el-form-item>
             <el-form-item label="销售部门:" prop="salesDeptName">
               {{ form.salesDeptName }}
             </el-form-item>
+            <el-form-item label="订单总金额:" prop="totalAmount">
+              {{ form.totalAmount }}元
+            </el-form-item>
+
+            <el-form-item prop="orderFiles" label="订单附件:">
+              <fileMain v-model="detailData.orderFiles" type="view"></fileMain>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="合同名称:" prop="contractName">
+              {{ form.contractName }}
+            </el-form-item>
+
             <el-form-item label="销售类型:" prop="saleTypeName">
               {{ form.saleTypeName }}
             </el-form-item>
             <el-form-item label="应付金额:" prop="payAmount">
               {{ form.payAmount }}元
             </el-form-item>
-            <el-form-item label="订单总金额:" prop="totalAmount">
-              {{ form.totalAmount }}元
+            <el-form-item label="订单备注:" prop="remark">
+              {{ form.remark }}
             </el-form-item>
 
-            <el-form-item label="订单类型:" prop="totalAmount">
-              {{
-                form.needProduce == 1
-                  ? '有客户生产性订单'
-                  : form.needProduce == 2
-                  ? '无客户生产性订单'
-                  : form.needProduce == 4
-                  ? '不定向订单'
-                  : '库存式订单'
-              }}
-            </el-form-item>
             <el-form-item
               label="总数"
               prop="totalPlanNum"