瀏覽代碼

代码上传

zhangqiOMG 2 年之前
父節點
當前提交
29b9713554

+ 8 - 1
src/HDrpManagement/orderManage/modules/add.vue

@@ -55,7 +55,7 @@
               </el-form-item>
             </el-col>
             <el-col v-if="form.type === '项目订单'" :span="12">
-              <el-form-item label="项目合同" prop="sa_contractid">
+              <el-form-item label="项目合同" prop="contractname">
                 <el-popover
                   placement="bottom"
                   trigger="click"
@@ -146,6 +146,7 @@ export default {
         "signbacknum":"",
         "promname":"",
         "projectnote":"",
+        "contractname":''
       },
       rules: {
         sa_brandid: [{
@@ -178,6 +179,12 @@ export default {
           message: '活动不能为空',
           trigger: 'blur'
         }],
+        contractname:[{
+          required: true,
+          message: '请选择合同',
+          trigger: 'change'
+        }],
+        
       },
       sa_brandidOptions: [],
       tradefieldOptions: [],

+ 1 - 1
src/SDrpManagement/agentOrder/modules/add.vue

@@ -147,7 +147,7 @@ export default {
           required: true,
           message: '项目不能为空',
           trigger: 'blur'
-        }]
+        }],
       },
       sa_brandidOptions: [],
       tradefieldOptions: [],

+ 4 - 0
src/SDrpManagement/salerOrder/index.vue

@@ -82,6 +82,10 @@
         <div v-else-if="scope.data.column.columnname == 'amount'">
           {{ tool.formatAmount(scope.data.column.data.amount,2) }}
         </div>
+        <!-- <div v-else-if="scope.data.column.columnname == 'tradefield'">
+          {{ scope.data.column.data.tradefield }}
+        </div> -->
+        
         <div v-else-if="scope.data.column.columnname == 'defaultamount'">
           {{ tool.formatAmount(scope.data.column.data.defaultamount,2) }}
         </div>

+ 8 - 10
src/SDrpManagement/salerOrder/modules/add.vue

@@ -55,7 +55,7 @@
               </el-form-item>
             </el-col>
             <el-col v-if="form.type === '项目订单'" :span="12">
-              <el-form-item label="项目合同" prop="sa_contractid">
+              <el-form-item label="项目合同" prop="contractname">
                 <el-popover
                   placement="bottom"
                   trigger="click"
@@ -144,7 +144,8 @@ export default {
         "rebate_used":0,//默认0,是否使用返利金
         "billdate":"",//单据日期,默认创建日期
         "signbacknum":"",
-        "promname":""
+        "promname":"",
+        "contractname":''
       },
       rules: {
         sa_brandid: [{
@@ -177,6 +178,11 @@ export default {
           message: '活动不能为空',
           trigger: 'blur'
         }],
+        contractname:[{
+          required: true,
+          message: '请选择合同',
+          trigger: 'change'
+        }],
       },
       sa_brandidOptions: [],
       tradefieldOptions: [],
@@ -201,14 +207,6 @@ export default {
   methods:{
     async handleCommand (command) {
       this.form.type = command
-      const res = await this.$api.requested({
-        "id": 20221108111402,
-        "content":this.form
-      })
-      // this.tool.showMessage(res,()=>{
-      //   this.$store.dispatch('changeDetailDrawer',true)
-      //   this.$router.push({path:'/orderdetail',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
-      // })
       this.drawer = true
       this.specordermx()