修改产品类型展示字段

@@ -226,6 +226,7 @@ export default {
     },
     },
     edit(record) { 
     edit(record) { 
       this.model = Object.assign({}, record)
       this.model = Object.assign({}, record)
+      console.log('this.model',this.model)
       this.modelDefault = this.model
       this.modelDefault = this.model
       this.choose = this.model.chooseStatus
       this.choose = this.model.chooseStatus
       if(!this.model.chooseStatus){
       if(!this.model.chooseStatus){
@@ -322,6 +323,8 @@ export default {
             httpurl += this.url.edit
             httpurl += this.url.edit
             method = 'put'
             method = 'put'
           }
           }
+          console.log(this.model)
+          // return
           httpAction(httpurl, this.model, method)
           httpAction(httpurl, this.model, method)
             .then((res) => {
             .then((res) => {
               if (res.success) {
               if (res.success) {

@@ -160,7 +160,7 @@
           {
           {
             title:'产品类型',
             title:'产品类型',
             align:"center",
             align:"center",
-            dataIndex: 'productType',
+            dataIndex: 'productTypeName',
           //   customRender: function (text) {
           //   customRender: function (text) {
           //   if (text === 'XC') {
           //   if (text === 'XC') {
           //     return '线槽'
           //     return '线槽'
@@ -251,7 +251,7 @@
         /* 分页参数 */
         /* 分页参数 */
         ipagination:{
         ipagination:{
           current: 1,
           current: 1,
-          pageSize: 5,
+          pageSize: 10,
           pageSizeOptions: ['5', '10', '50'],
           pageSizeOptions: ['5', '10', '50'],
           showTotal: (total, range) => {
           showTotal: (total, range) => {
             return range[0] + "-" + range[1] + " 共" + total + "条"
             return range[0] + "-" + range[1] + " 共" + total + "条"

@@ -156,7 +156,7 @@
             {
             {
               title:'产品类型',
               title:'产品类型',
               align:"center",
               align:"center",
-              dataIndex: 'productType',
+              dataIndex: 'productTypeName',
             //   customRender: function (text) {
             //   customRender: function (text) {
             //   if (text === 'XC') {
             //   if (text === 'XC') {
             //     return '线槽'
             //     return '线槽'
@@ -222,7 +222,7 @@
           /* 分页参数 */
           /* 分页参数 */
           ipagination:{
           ipagination:{
             current: 1,
             current: 1,
-            pageSize: 5,
+            pageSize: 10,
             pageSizeOptions: ['5', '10', '50'],
             pageSizeOptions: ['5', '10', '50'],
             showTotal: (total, range) => {
             showTotal: (total, range) => {
               return range[0] + "-" + range[1] + " 共" + total + "条"
               return range[0] + "-" + range[1] + " 共" + total + "条"

@@ -148,6 +148,9 @@ export default {
         deliveryTime: [
         deliveryTime: [
           { required: true, message: '请输入要求到货时间!' },
           { required: true, message: '请输入要求到货时间!' },
         ],
         ],
+        wuType:[
+        { required: true, message: '请选择物料类别!' },
+        ]
         // pics: [
         // pics: [
         //   { required: true, message: '请输入主料图片!' },
         //   { required: true, message: '请输入主料图片!' },
         // ],
         // ],

@@ -20,7 +20,7 @@
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
           <a-col :span="24">
           <a-col :span="24">
-            <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quantity" style="margin-bottom: -50px">
+            <a-form-model-item label="数量（套）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quantity" style="margin-bottom: -50px">
               {{model.quantity}}
               {{model.quantity}}
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
@@ -178,7 +178,7 @@ export default {
       if(record){
       if(record){
         this.titlea = '编辑'
         this.titlea = '编辑'
         this.model =  Object.assign({}, record);
         this.model =  Object.assign({}, record);
-        console.log('this.model=======',this.model)
+        // console.log('this.model=======',this.model)
         this.loadDesign();
         this.loadDesign();
         this.loadBiddingSq()
         this.loadBiddingSq()
       }else{
       }else{
@@ -214,7 +214,7 @@ export default {
         let tblBiddingShenq = {
         let tblBiddingShenq = {
           orderId:this.model.orderId
           orderId:this.model.orderId
         }
         }
-        console.log(tblBiddingShenq)
+        console.log('tblBiddingShenq',tblBiddingShenq)
         listDesign(tblBiddingShenq).then((res)=>{
         listDesign(tblBiddingShenq).then((res)=>{
           console.log('loadDesign',res)
           console.log('loadDesign',res)
           if(res.success){
           if(res.success){