Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

src/views/PurchasingManage/ArrivalOrder/edit.vue

@@ -80,7 +80,7 @@
                       style="width: 200px"
                       placeholder="年/月/日"
                       v-model="searchData.arrive_time"></DatePicker>
-          <span v-show="isCheck">{{searchData.arrive_time}}</span>
+          <span v-show="isCheck">{{func.replaceDateNoHMS(searchData.arrive_time)}}</span>
         </FormItem>
         <FormItem label="备注:">
           <Input type="textarea"
@@ -696,6 +696,7 @@ export default {
         const data = JSON.parse(JSON.stringify(res.data))
         delete data.list
         this.searchData = data
+        console.log(this.searchData);
         this.searchData.arrive_time = this.searchData.arrive_time * 1000 ? new Date(this.searchData.arrive_time * 1000).toLocaleString() : ''
         this.searchData.crt_time = this.searchData.crt_time ? new Date(this.searchData.crt_time * 1000).toLocaleString() : ''
       }).catch((err) => { });

src/views/PurchasingManage/InstockOrder/edit.vue

@@ -550,7 +550,7 @@ export default {
   // 生命周期 - 创建完成（可以访问当前this实例）
   created () {
     // 获取采购类型
-    this.axios({ method: 'get', url: '/api/basic_purchase_list', }).then((res) => { this.purchaseTypeList = res.data.data }).catch((err) => { });
+    this.axios({ method: 'get', url: '/api/basic_order_in_list', }).then((res) => { this.purchaseTypeList = res.data.data }).catch((err) => { });
     // 获取基础物料类型
     this.axios({ method: 'get', url: '/api/basics_material_index_level', }).then((res) => { this.modalData.treeData[0].list = res.data }).catch((err) => { });
     // 获取仓库列表

src/views/PurchasingManage/RequisitionOrder/edit.vue

@@ -22,7 +22,7 @@
             type="text"
             size="small"
             v-show="!isCheck"
-            v-model="searchData.client_name"
+            v-model="searchData.residential_name"
             style="width: 200px; margin-top: 6px"
             placeholder="项目名称"
           >
@@ -33,7 +33,7 @@
               >选择</span
             >
           </Input>
-          <span v-show="isCheck">{{ searchData.client_name }}</span>
+          <span v-show="isCheck">{{ searchData.residential_name }}</span>
         </FormItem>
         <FormItem label="请购类型:">
           <Select
@@ -536,7 +536,7 @@ export default {
         },
         {
           title: "项目名称",
-          key: "client_name",
+          key: "residential_name",
           align: "center",
           minWidth: 100,
         },
@@ -797,7 +797,7 @@ export default {
       // console.log('this.modalData.selectedData :>> ', this.modalData.selectedData);
     },
     handleProjectSelect() {
-      this.searchData.client_name = this.currentChoose.client_name;
+      this.searchData.residential_name = this.currentChoose.residential_name;
       this.searchData.order_no = this.currentChoose.order_no;
     },
     goBack() {