同步订单审批表单修改

zkqy-ui/src/views/orderMange/approve.vue

@@ -294,7 +294,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="交货周期:" size="normal">
+            <el-form-item label="交货天数:" size="normal">
               <el-input
                 disabled
                 size="small"
@@ -302,6 +302,20 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="交货日期:" size="normal" prop="deliveryDate">
+              <el-date-picker
+                size="small"
+                v-model="formData.deliveryDate"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                type="date"
+                disabled
+                placeholder="选择日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-divider>货品明细</el-divider>
           </el-col>
@@ -315,11 +329,6 @@
           >
             <el-table-column prop="productName" label="品名" width="180">
               <template slot-scope="scope">
-                <!-- <el-input
-                v-model="scope.row.productName"
-                size="small"
-                clearable
-              ></el-input> -->
                 <el-select
                   v-model="scope.row.productNo"
                   placeholder=""
@@ -448,12 +457,30 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="付款方式">
-              <el-input
+              <el-select
                 v-model="formData.salePayType"
                 size="small"
+                clearable
+                filterable
                 disabled
+              >
+                <el-option
+                  v-for="item in dict.type.payment_method"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="formData.salePayType == '1'">
+            <el-form-item prop="earnestMoney" label="定金">
+              <el-input
+                v-model="formData.earnestMoney"
                 clearable
-              ></el-input>
+                size="small"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -499,6 +526,24 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="捻向:">
+              <el-select
+                v-model="formData.directionOfTwist"
+                clearable
+                filterable
+                disabled
+              >
+                <el-option
+                  v-for="item in dict.type.direction_of_twist"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="其它:">
               <el-input
@@ -732,7 +777,7 @@ import { mapState } from "vuex";
 export default {
   name: "listInfo",
   components: { Queryfrom, Menu, DialogTemplate },
-  dicts: ["sales_order_type"],
+  dicts: ["sales_order_type", "payment_method", "direction_of_twist"],
   data() {
     return {
       // 审批相关数据
@@ -765,9 +810,11 @@ export default {
         saleDate: "", //销售单日期
         saleOrderEstimatedTime: "", //预计下单时间
         saleLeadTime: "", //交货周期
+        deliveryDate: "",
         saleAmounts: "", //合计金额 小写
         saleAmountInWords: "", //合计金额 大写
         salePayType: "", //支付方式
+        earnestMoney: "", //定金
         salesman: "", //业务员
         saleLeader: "", //业务主管
         finance: "", //财务部
@@ -789,6 +836,7 @@ export default {
         craftOil: "", //油剂
         craftPackage: "", //卷装
         craftColorFastness: "", //色牢度
+        directionOfTwist: "", //捻向
         craftOther: "", //其它工艺要求
         craftMark: "", //包装/贴唛
         shippingMethod: "", //运输方式
@@ -1028,9 +1076,11 @@ export default {
         saleDate: "", //销售单日期
         saleOrderEstimatedTime: "", //预计下单时间
         saleLeadTime: "", //交货周期
+        deliveryDate: "",
         saleAmounts: "", //合计金额 小写
         saleAmountInWords: "", //合计金额 大写
         salePayType: "", //支付方式
+        earnestMoney: "",
         salesman: "", //业务员
         saleLeader: "", //业务主管
         finance: "", //财务部
@@ -1052,6 +1102,7 @@ export default {
         craftOil: "", //油剂
         craftPackage: "", //卷装
         craftColorFastness: "", //色牢度
+        directionOfTwist: "",
         craftOther: "", //其它工艺要求
         craftMark: "", //包装/贴唛
         shippingMethod: "", //运输方式
@@ -1289,9 +1340,11 @@ export default {
             saleDate,
             saleOrderEstimatedTime,
             saleLeadTime,
+            deliveryDate,
             saleAmounts,
             saleAmountInWords,
             salePayType,
+            earnestMoney,
             salesman,
             saleLeader,
             finance,
@@ -1303,6 +1356,7 @@ export default {
             craftOil,
             craftPackage,
             craftColorFastness,
+            directionOfTwist,
             craftOther,
             craftMark,
             shippingMethod,
@@ -1321,9 +1375,11 @@ export default {
             saleDate,
             saleOrderEstimatedTime,
             saleLeadTime,
+            deliveryDate,
             // saleAmounts, //合计金额  小写
             saleAmountInWords,
             salePayType,
+            earnestMoney,
             salesman,
             saleLeader,
             finance,
@@ -1337,6 +1393,7 @@ export default {
             craftOil,
             craftPackage,
             craftColorFastness,
+            directionOfTwist,
             craftOther,
             craftMark,
             shippingMethod,