Merge branch 'master' of http://139.196.39.194:9021/yuansh/doors-windows-web

src/views/production/materialprocurement/modules/materialProcurementAdd.vue

@@ -27,7 +27,7 @@
                             <a-date-picker showTime valueFormat="YYYY-MM-DD" format = "YYYY-MM-DD" v-model="form.orderDate" style="width:100%"/>
                         </a-form-item>
                     </a-col>
-                    <a-col :md="4" :sm="24">
+                   <!-- <a-col :md="4" :sm="24">
                         <a-form-item label="单据状态">
                             <a-select v-model="form.state"  style='width:100%' >
                                 <a-select-option value='自由'> 自由</a-select-option>
@@ -37,7 +37,7 @@
                                 <a-select-option value='已关闭'> 已关闭</a-select-option>
                             </a-select>
                         </a-form-item>
-                    </a-col>
+                    </a-col> -->
                     <a-col :md="4" :sm="24">
                         <a-form-item label="项目编码">
                             <a-input placeholder="请输入" v-model="form.projectCode"></a-input>
@@ -61,7 +61,8 @@
                     <a-col :md="4" :sm="24">
                         <a-form-item label="业务类型">
                             <a-select v-model="form.type"  style='width:100%' >
-                                <a-select-option value='1'> 1</a-select-option>
+                                <a-select-option value='家装'>家装</a-select-option>
+                                <a-select-option value='工装'>工装</a-select-option>
                             </a-select>
                         </a-form-item>
                     </a-col>

src/views/production/materialprocurement/modules/materialProcurementDetail.vue

@@ -63,7 +63,8 @@
                     <a-col :md="4" :sm="24">
                         <a-form-item label="业务类型">
                             <a-select v-model="form.type"  style='width:100%' disabled>
-                                <a-select-option value='1'> 1</a-select-option>
+                                <a-select-option value='家装'>家装</a-select-option>
+                                <a-select-option value='工装'>工装</a-select-option>
                             </a-select>
                         </a-form-item>
                     </a-col>