家装

src/views/Agreement/deepen/edit.vue

@@ -16,18 +16,18 @@
           >
         </Upload>
             <Button @click="back" style="margin-right:10px">返回</Button>
-            <Button @click="postData"  v-if="$route.query.type!=3">保存</Button>
+            <Button @click="handleSubmit('formValidate')"  v-if="$route.query.type!=3">保存</Button>
         </Toptitle>
         <div class="content">
-            <Form :label-width='120' class="form_content" :style="$route.query.type==3?{'border-bottom':'1px solid #eeeeee'}:{}">
+            <Form :label-width='120' class="form_content" :style="$route.query.type==3?{'border-bottom':'1px solid #eeeeee'}:{}" ref="formValidate" :model="formData" :rules="ruleValidate">
                 <FormItem label='金螳螂ID：'>
                     <span v-if="$route.query.type==3" class="form_item">{{formData.jtl_id}}</span>
                     <Input v-else clearable v-model="formData.jtl_id" placeholder="请输入金螳螂ID"/>
                     
                 </FormItem>
-                <FormItem label='项目编码：'>
+                <FormItem label='项目编码：' prop='order_no'>
                     <span v-if="$route.query.type==3" class="form_item">{{formData.order_no}}</span>
-                    <Input v-else clearable v-model="formData.order_no" placeholder="请输入项目编码"/>
+                    <Input v-else clearable v-model="formData.order_no" placeholder="请输入项目编码" :disabled='$route.query.type!=1'/>
                 </FormItem>
                 <FormItem label='项目名称：'>
                     <span v-if="$route.query.type==3" class="form_item">{{formData.project_title}}</span>
@@ -88,6 +88,11 @@
 export default {
     data(){
         return{
+             ruleValidate: {
+                    order_no: [
+                        { required: true, message: '项目编码不能为空', trigger: 'blur' }
+                    ],
+             },
             regionList:[],
             urlNumberList:[],
             productTitleList:[],
@@ -146,6 +151,15 @@ export default {
      }
     },
     methods:{
+          handleSubmit (name) {
+                this.$refs[name].validate((valid) => {
+                    if (valid) {
+                        this.postData();
+                    } else {
+                        this.$Message.error('请输入项目编码！');
+                    }
+                })
+            },
         search(){
             let obj = JSON.parse(JSON.stringify(this.searchData));
             obj.start_time = obj.start_time?Date.parse(obj.start_time).toString().slice(0,10):'';
@@ -209,9 +223,9 @@ export default {
             if(this.tableData.length==0){
             return this.$Message.warning('请先导入数据！')
             }
-            if(!this.formData.order_no||!this.formData.project_title||!this.formData.abbreviation){
-                return this.$Message.warning('请输入完整信息！')
-            }
+            // if(!this.formData.order_no||!this.formData.project_title||!this.formData.abbreviation){
+            //     return this.$Message.warning('请输入完整信息！')
+            // }
             
             if(this.$route.query.type==1){
                   this.axios.post('/api/contract_deep_add',{...this.formData,children:this.tableData}).then(res=>{

src/views/Agreement/edit.vue

@@ -2,11 +2,11 @@
     <div>
         <Toptitle :title="this.$route.query.type==1?'新增':this.$route.query.type==2?'编辑':this.$route.query.type==3?'变更':'详情'">
             <Button type="primary" @click="back" style="margin-right:10px">返回</Button>
-            <Button type="primary" @click="postData" v-if="$route.query.type!=4">保存</Button>
+            <Button type="primary" @click="handleSubmit('formValidate')" v-if="$route.query.type!=4">保存</Button>
         </Toptitle>
         <div style="height:90%;overflow:auto">
-        <Form :label-width='100' class="content">
-          <FormItem label='项目编码：'>
+        <Form :label-width='100' class="content" ref="formValidate" :model="formData" :rules="ruleValidate">
+          <FormItem label='项目编码：' prop='order_no'>
               <Input placeholder="请输入项目编码" v-model="formData.order_no" class="form_item" clearable v-if="$route.query.type==1||$route.query.type==2" :disabled='$route.query.type!=1'/>
               <span class="form_span" v-else>{{formData.order_no}}</span>
           </FormItem>
@@ -185,6 +185,11 @@
 export default {
     data(){
         return{
+            ruleValidate: {
+                    order_no: [
+                        { required: true, message: '项目编码不能为空', trigger: 'blur' }
+                    ],
+                    },
             tableIndex:null,
             bp_list:[],
             showPicIndex:null,
@@ -249,6 +254,15 @@ export default {
            this.$route.query.type!=1&&this.initData();
     },
     methods:{
+        handleSubmit (name) {
+                this.$refs[name].validate((valid) => {
+                    if (valid) {
+                        this.postData();
+                    } else {
+                        this.$Message.error('请输入项目编码！');
+                    }
+                })
+            },
         checkPrice(row,index){
            if(row.total_bid_price<0){
                row.total_bid_price = '0.00';
@@ -519,7 +533,6 @@ export default {
           this.$router.go(-1)
         },
         postData(){
-           
             let data = JSON.parse(JSON.stringify(this.formData));
             data.project_date = this.formData.project_date?Date.parse(this.formData.project_date).toString().slice(0,10):'';
             data.phase = data.phase?this.formData.phase.toString():'';

src/views/Agreement/productMessage/confirm.vue

@@ -8,15 +8,15 @@
             <div style="height:85%;overflow:auto">
             <Form :label-width='100' class="form_content">
                 <FormItem label='生产通知单：'>
-                    <Input style="width: 200px" clearable/>
+                    <Input style="width: 200px" clearable v-model="searchData.product_no"/>
                 </FormItem>
                 <FormItem label='下通知时间：'>
-                    <DatePicker type="date" placeholder="年/月/日" style="width: 200px"></DatePicker>
+                    <DatePicker type="date" placeholder="年/月/日" style="width: 200px" v-model="searchData.start_time"></DatePicker>
                     ~
-                    <DatePicker type="date" placeholder="年/月/日" style="width: 200px"></DatePicker>
+                    <DatePicker type="date" placeholder="年/月/日" style="width: 200px" v-model="searchData.end_time"></DatePicker>
                 </FormItem>
                 <FormItem :label-width='60'>
-                    <Button type="primary">
+                    <Button type="primary" @click="initData(searchData)">
                         搜索
                     </Button>
                     </FormItem>

src/views/OrderMannage/BusinessOrderlist/confirm.vue

@@ -324,7 +324,6 @@
                 v-if="!scope.row.is_metal"
                 label-in-value
                 v-model="scope.row[process.id]"
-                @change="$refs.xTable.updateStatus(scope)"
                 @on-change="changeEditProcess(scope.row, process)"
               
               >
@@ -338,7 +337,10 @@
                     )
                 " -->
                 <Option
-                
+                   v-for="item in process.cld"
+                   :key="item.id"
+                   :value="item.id"
+                   :label="item.title"
                 ></Option>
               </Select>
             </template>
@@ -347,10 +349,10 @@
                 row.is_metal
                   ? ""
                   : getSelectedLabel(
-                      row[process.id],
+                      process.id,
                       process.cld,
-                      "id",
-                      "title"
+                      'id',
+                      'title'
                     )
               }}</template
             >
@@ -1053,9 +1055,9 @@
       ],
        tableData:[
               { id: 10001, name: 'Test1', nickname: 'T1', role: 'Develop', sex: '0', sex2: ['0'], num1: 40, age: 28, address: 'Shenzhen', date12: '', date13: '' },
-              { id: 10002, name: 'Test2', nickname: 'T2', role: 'Designer', sex: '1', sex2: ['0', '1'], num1: 20, age: 22, address: 'Guangzhou', date12: '', date13: '2020-08-20' },
-              { id: 10003, name: 'Test3', nickname: 'T3', role: 'Test', sex: '0', sex2: ['1'], num1: 200, age: 32, address: 'Shanghai', date12: '2020-09-10', date13: '' },
-              { id: 10004, name: 'Test4', nickname: 'T4', role: 'Designer', sex: '1', sex2: ['1'], num1: 30, age: 23, address: 'Shenzhen', date12: '', date13: '2020-12-04' }
+              // { id: 10002, name: 'Test2', nickname: 'T2', role: 'Designer', sex: '1', sex2: ['0', '1'], num1: 20, age: 22, address: 'Guangzhou', date12: '', date13: '2020-08-20' },
+              // { id: 10003, name: 'Test3', nickname: 'T3', role: 'Test', sex: '0', sex2: ['1'], num1: 200, age: 32, address: 'Shanghai', date12: '2020-09-10', date13: '' },
+              // { id: 10004, name: 'Test4', nickname: 'T4', role: 'Designer', sex: '1', sex2: ['1'], num1: 30, age: 23, address: 'Shenzhen', date12: '', date13: '2020-12-04' }
             ],
        info: {
         custom_detail_name:'',//负责人
@@ -1383,8 +1385,11 @@
       changeEditProcess(){
 
       },
-      getSelectedLabel(){
-
+      getSelectedLabel(id,list,key,label){
+          const item = list.find(v=>{
+            return v[key] == id;
+          })
+          return item?item[label]:null
       },
       HandleAutoCreateNewLine(){
 

vue.config.js

@@ -1,6 +1,6 @@
 const axios_default_ip =
   process.env.NODE_ENV == "dev"
-    ? "http://121.41.102.225:82"
+    ? "http://124.71.176.88:882"
     : process.env.NODE_ENV == "test-prd"
     ? "http://121.41.102.225:82" //测试服
     : process.env.NODE_ENV == "prd_other"