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

# Conflicts:
#	vue.config.js

src/views/BasicSettings/SuppliersManage/SippliersStockPriceList.vue

@@ -12,14 +12,14 @@
             <FormItem label="供应商分类编码:">
               <Input type="text"
                      size="small"
-                     v-model="searchData.code"
+                     v-model="searchData.type_code"
                      style="width: 150px"
                      placeholder="供应商分类编码" />
             </FormItem>
             <FormItem label="供应商分类名称:">
               <Input type="text"
                      size="small"
-                     v-model="searchData.title"
+                     v-model="searchData.type_title"
                      style="width: 150px"
                      placeholder="供应商分类名称" />
             </FormItem>
@@ -51,6 +51,7 @@
           </Form>
           <div class="content_top_btn">
             <Button type="primary"
+            @click="initData"
                     size="small">搜索</Button>
           </div>
         </div>
@@ -115,12 +116,11 @@ export default {
     // 这里存放数据
     return {
       searchData: {
+        type_code:'',
         code: '',
         title: '',
-        user: '',
         state: '',
-        start_time: '',
-        end_time: '',
+        type_title:'',
       },
       tableColumns: [
         { title: '供应商分类编码', key: 'type_code', align: 'center', minWidth: 140 },
@@ -156,7 +156,7 @@ export default {
       this.axios({
         method: 'get',
         url: '/api/supply_material_list',
-        data: {
+        params: {
           ...this.searchData
         }
       }).then((res) => {

src/views/BasicSettings/SuppliersManage/SippliersStockPriceListEdit.vue

@@ -284,7 +284,7 @@ export default {
         case 1:
           this.axios({
             method: 'post',
-            url: '/api/supply_material_edit',
+            url: '/api/supply_material_add',
             data: {
               supply_id: this.$route.query.supply_id ? this.$route.query.supply_id : this.searchData.id,
               supply_material: this.tableData,

src/views/BidSystem/DeepeningOrder/changeRecordDetail.vue

@@ -140,7 +140,7 @@
                     <span>{{row.status === 0 ? '变更':row.status === 1? '新增':'删除'}}</span>
         </template>
          <template slot="set" slot-scope="{ row }">
-              <a @click="orderDisposal" v-show="row.status === 1" style="color:#fff">下拆单</a>
+              <a @click="orderDisposal" v-show="row.status === 1" style="color:#2d8cf0;">下拆单</a>
         </template>
       </Table>
       <div class="List_form_content">

src/views/BidSystem/ProductDeOrder/infoDetail.vue

@@ -28,27 +28,15 @@
       <div class="form">
         <Form class="form_content" :label-width="100">
           <FormItem label="项目编号:">
-            <Input
-              v-if="type == 6"
-              v-model="saveData.order_no"
-              placeholder="请输入项目编码"
-            />
+            <Input v-if="type == 6" v-model="saveData.order_no" placeholder="请输入项目编码"/>
             <span style="width: 120px" v-else>{{ formData.order_no }}</span>
           </FormItem>
           <FormItem label="项目名称:">
-            <Input
-              v-if="type == 6"
-              v-model="saveData.residential_name"
-              placeholder="请输入项目名称"
-            />
+            <Input v-if="type == 6" v-model="saveData.residential_name" placeholder="请输入项目名称"/>
             <span v-else>{{ formData.residential_name }}</span>
           </FormItem>
           <FormItem label="项目简称:">
-            <Input
-              v-if="type == 6"
-              v-model="saveData.abbreviation"
-              placeholder="请输入项目简称"
-            />
+            <Input v-if="type == 6" v-model="saveData.abbreviation" placeholder="请输入项目简称"/>
             <span v-else>{{ formData.abbreviation }}</span>
           </FormItem>
           <FormItem label="客户名称:">
@@ -69,7 +57,11 @@
             <span v-else>{{ formData.custom_title }}</span>
           </FormItem>
           <FormItem label="紧急程度:">
-            <Select clearable v-model="saveData.warning_state" v-if="type == 6">
+            <Select
+              clearable
+              v-model="saveData.warning_state"
+              v-if="type == 6"
+            >
               <Option
                 v-for="(item, index) in warning_state_list"
                 :key="index"
@@ -80,11 +72,7 @@
             <span v-else>{{ formData.warning_state }}</span>
           </FormItem>
           <FormItem label="项目定金:">
-            <Input
-              v-if="type == 6"
-              v-model="saveData.front_money"
-              placeholder="请输入项目定金"
-            />
+            <Input v-if="type == 6" v-model="saveData.front_money" placeholder="请输入项目定金"/>
             <span v-else>{{ formData.front_money }}</span>
           </FormItem>
           <FormItem label="详细地址:">
@@ -167,12 +155,7 @@
             <span v-else>{{ formData.nickname }}</span>
           </FormItem>
           <FormItem label="备注:">
-            <Input
-              v-if="type == 6"
-              v-model="saveData.remark"
-              type="textarea"
-              placeholder="请输入备注"
-            />
+            <Input v-if="type == 6" v-model="saveData.remark" type="textarea" placeholder="请输入备注"/>
             <span v-else>{{ formData.remark }}</span>
           </FormItem>
         </Form>
@@ -453,7 +436,7 @@
             </FormItem>
           </Form>
         </div>
-        <Tabs type="card" @on-click="handleTabsChange">
+        <Tabs type="card" @on-click="getData">
           <TabPane
             v-for="tab in tabs"
             :key="tab"
@@ -530,15 +513,10 @@
 export default {
   data() {
     return {
-      ruleValidate: {
-        name: [
-          {
-            required: true,
-            message: "The name cannot be empty",
-            trigger: "blur",
-          },
-        ],
-      },
+        ruleValidate: {
+                    name: [
+                        { required: true, message: 'The name cannot be empty', trigger: 'blur' }
+                    ]},
       totalColumns: [
         { type: "selection", align: "center", width: 60 },
         { title: "序号", align: "center", type: "index", minWidth: 200 },
@@ -689,10 +667,10 @@ export default {
         custom_detail_mobile: "",
         custom_detail_id: "",
       },
-      formData: {},
-      custom_title_list: [],
-      warning_state_list: [],
-      nickname_list: [],
+      formData:{},
+      custom_title_list:[],
+      warning_state_list:[],
+      nickname_list:[],
       searchData: {
         area_code: [],
         area_title: [],
@@ -707,7 +685,7 @@ export default {
         url_number: [],
         product_title: [],
         material: "",
-        color: "",
+        color: '',
         work: "",
         state: "",
       },
@@ -730,6 +708,7 @@ export default {
       search_state: false,
       copy_form: [],
       type: this.$route.query.type,
+      formData: {},
       tabs: 2,
       total: 0,
       page_index: 1,
@@ -750,7 +729,7 @@ export default {
           params: { order_no: this.$route.query.order_no },
         })
         .then((res) => {
-          this.formData = res.data;
+          this.formData = res.msg;
         });
       this.getData();
     } else {
@@ -768,6 +747,9 @@ export default {
     }
   },
   methods: {
+    handleBeforeUpload(){
+
+    },
     handleClientDetailChange(val) {
       val && (this.info.custom_detail_id = val);
     },
@@ -855,32 +837,15 @@ export default {
         if (this.search_state) {
           this.axios
             .post("/api/order_area_details", {
-              order_no: this.$route.query.order_no || this.saveData.order_no,
+              order_no: this.$route.query.order_no,
               page_index: this.page_index,
               page_size: this.page_size,
               ...this.searchData,
             })
             .then((res) => {
               console.log(res);
-              this.detailData = res.data.data;
-              this.total = res.data.total;
-              this.area_code = res.data.area_code;
-              this.area_title = res.data.area_title;
-              this.color = res.data.color;
-              this.fashion = res.data.fashion;
-              this.house = res.data.house;
-              this.house_type = res.data.house_type;
-              this.layer = res.data.layer;
-              this.material = res.data.material;
-              this.number = res.data.number;
-              this.position = res.data.position;
-              this.product_title = res.data.product_title;
-              this.product_type = res.data.product_type;
-              this.state = res.data.state;
-              this.unit = res.data.unit;
-              this.url_number = res.data.url_number;
-              this.work = res.data.work;
-              this.copy_form = this.searchData;
+              this.detailData = res.msg.data;
+              this.total = res.msg.total;
             });
         } else {
           this.$route.query.order_no &&
@@ -955,25 +920,25 @@ export default {
             ...this.searchData,
           })
           .then((res) => {
-            console.log(res.data.house_type, this.house_type);
-            this.totalData = res.data.data;
-            this.total = res.data.total;
-            this.area_code = res.data.area_code;
-            this.area_title = res.data.area_title;
-            this.color = res.data.color;
-            this.fashion = res.data.fashion;
-            this.house = res.data.house;
-            this.house_type = res.data.house_type;
-            this.layer = res.data.layer;
-            this.material = res.data.material;
-            this.number = res.data.number;
-            this.position = res.data.position;
-            this.product_title = res.data.product_title;
-            this.product_type = res.data.product_type;
-            this.state = res.data.state;
-            this.unit = res.data.unit;
-            this.url_number = res.data.url_number;
-            this.work = res.data.work;
+              console.log(res.msg.house_type,this.house_type)
+            this.totalData = res.msg.data;
+            this.total = res.msg.total;
+            this.area_code = res.msg.area_code;
+            this.area_title = res.msg.area_title;
+            this.color = res.msg.color;
+            this.fashion = res.msg.fashion;
+            this.house = res.msg.house;
+            this.house_type = res.msg.house_type;
+            this.layer = res.msg.layer;
+            this.material = res.msg.material;
+            this.number = res.msg.number;
+            this.position = res.msg.position;
+            this.product_title = res.msg.product_title;
+            this.product_type = res.msg.product_type;
+            this.state = res.msg.state;
+            this.unit = res.msg.unit;
+            this.url_number = res.msg.url_number;
+            this.work = res.msg.work;
             this.copy_form = this.searchData;
           });
       }
@@ -982,6 +947,7 @@ export default {
       this.$Message.error(err.msg || "导入失败");
     },
     uploadSuccess(res) {
+        
       if (res.code == 200) {
         this.$Message.success("导入成功");
         this.search_state = true;
@@ -989,30 +955,48 @@ export default {
       } else {
         this.$Message.warning(res.msg || "导入失败");
       }
-    },
-    async handleBeforeUpload() {
-      this.uploadData.order_no = this.saveData.order_no;
-      return true;
-    },
-    save() {
-      if (
-        this.saveData.order_no &&
-        this.saveData.residential_name &&
-        this.saveData.abbreviation &&
-        this.saveData.custom_title &&
-        this.saveData.warning_state
-      ) {
+      this.page_index = 1;
+        this.page_size = 10;
         this.axios
-          .post("/api/order_area_save", { ...this.saveData })
+          .post("/api/order_area_details", {
+            ...this.$route.query,
+            ...{ page_index: this.page_index, page_size: this.page_size },
+            order_no:this.saveData.order_no
+          })
           .then((res) => {
-            if (res.code == 200) {
-              this.$Message.success(res.msg);
-              this.save_state = true;
-            }
+              console.log(res)
+            this.totalData = res.msg.data;
+            this.total = res.msg.total;
+            this.area_code = res.msg.area_code;
+            this.area_title = res.msg.area_title;
+            this.color = res.msg.color;
+            this.fashion = res.msg.fashion;
+            this.house = res.msg.house;
+            this.house_type = res.msg.house_type;
+            this.layer = res.msg.layer;
+            this.material = res.msg.material;
+            this.number = res.msg.number;
+            this.position = res.msg.position;
+            this.product_title = res.msg.product_title;
+            this.product_type = res.msg.product_type;
+            this.state = res.msg.state;
+            this.unit = res.msg.unit;
+            this.url_number = res.msg.url_number;
+            this.work = res.msg.work;
+            this.copy_form = this.searchData;
           });
-      } else {
-        this.$Message.error("请填写必要信息！");
-      }
+    },
+    save() {
+        if(!this.saveData.order_no&&!this.saveData.residential_name&&!this.saveData.abbreviation&&!this.saveData.custom_title&&!this.saveData.warning_state){
+            this.$message.error('请填写必要信息！');
+        }else{ 
+            this.axios.post('/api/order_area_save',{...this.saveData}).then(res=>{
+           this.$message.success(res.msg)
+           this.save_state = true;
+      })
+
+        }
+     
     },
     goback() {
       this.$router.go(-1);
@@ -1027,7 +1011,7 @@ export default {
   },
 };
 </script>
-<style scoped lang="scss">
+<style scoped lang='scss'>
 .changeDetail {
   .content {
     overflow: auto;
@@ -1046,11 +1030,11 @@ export default {
     }
   }
 }
-.ivu-form-item {
-  width: 250px;
+.ivu-form-item{
+    width: 250px;
 }
-.upload {
-  display: flex;
-  justify-content: space-around;
+.upload{
+    display: flex;
+    justify-content: space-around;
 }
-</style>
+</style>

src/views/ProcessRequire/index.vue

@@ -227,7 +227,7 @@ export default {
       });
     },
     async exportData () {
-      const res = await this.axios('/api/process_route_index_export', { params: { ...this.proxyObj, page: 0 } })
+      const res = await this.axios('/api/process_require_export', { params: { ...this.proxyObj, page: 0 } })
       if (res.code == 200) {
         let url = `${this.$store.state.ip}/api/storage/${res.data.file}`
         location.href = url

src/views/ProductionOrderList/Dispatchlist/details.vue

@@ -48,6 +48,7 @@
           <a
             class="map-margin"
             style="color:#ed4014"
+            v-if="row.sub_state == 3"
             @click="workoveragain(row, 1)"
             >返工</a
           >

src/views/ProductionOrderList/InboundForm/details.vue

@@ -67,14 +67,13 @@
         >
       </div>
       <template slot-scope="{ row }" slot="set">
-        <a
+        <!-- <a
           v-if="$route.query.type == 4"
           class="map-margin"
           :disabled="row.order_in_no"
           @click="confirmSuccess(row)"
           >确认入库</a
         >
-        <!-- v-if="$route.query.type == 4&&row.in_out_value!=1" -->
         <a
           v-if="$route.query.type == 4"
           class="map-margin"
@@ -93,6 +92,17 @@
           class="map-margin"
           @click="row.sub_state != 3 ? outShip(row, 2) : ''"
           >{{ row.sub_state != 3 ? "运输" : "" }}</a
+        > -->
+         <a 
+          class="map-margin"
+          v-if="row.in_out_value !== 1"
+          @click="outShip(row,3)"
+          >确认出库</a
+        >
+         <a
+          class="map-margin"
+          @click="row.sub_state != 3 ? outShip(row, 2) : ''"
+          >{{ row.sub_state != 3 ? "运输" : "" }}</a
         >
       </template>
       <Modal
@@ -569,6 +579,7 @@ export default {
           .toLocaleDateString()
           .replace(/\//g, "-");
       }
+
       this.axios.post("/api/orders_out", this.info).then((res) => {
         if (res.code == 200) {
           this.$Message.success(res.msg);
@@ -580,6 +591,22 @@ export default {
 
     outShip(row, type) {
       //type 1出库  2运输
+      if(type == 3){
+             this.confirmDelete({
+        title:  "确认出库" ,
+        content: "确认出库么？" ,
+        type: "primary",
+         then: (e) => {
+          this.axios.post('/api/orders_transport', {transport_no:row.transport_no}).then((res) => {
+            if (res.code == 200) {
+              this.$Message.success(res.msg);
+              this.getData(this.proxyObj);
+            }
+          });
+        },
+        cancel: (e) => {},
+      });
+      }else{
       if (!row || row.length < 1) {
         return this.$Message.error("请至少选择一项");
       }
@@ -601,7 +628,7 @@ export default {
           });
         },
         cancel: (e) => {},
-      });
+      });}
     },
     async exportData() {
       const res = await this.axios("/api/orders_list_detail", {

src/views/PurchasingManage/ArrivalOrder/list.vue

@@ -17,6 +17,7 @@
         <FormItem label="订单号:">
           <Input type="text"
                  size="small"
+                 clearable
                  v-model="searchData.order_no"
                  style="width: 150px"
                  placeholder="订单号" />

src/views/PurchasingManage/PurchasingOrder/list.vue

@@ -19,11 +19,13 @@
                  size="small"
                  v-model="searchData.order_no"
                  style="width: 150px"
+                 clearable
                  placeholder="订单号" />
         </FormItem>
         <FormItem label="项目名称:">
           <Input type="text"
                  size="small"
+                 clearable
                  v-model="searchData.project_title"
                  style="width: 150px"
                  placeholder="项目名称" />
@@ -33,6 +35,7 @@
                  size="small"
                  v-model="searchData.supply_title"
                  style="width: 150px"
+                 clearable
                  placeholder="供应商名称" />
         </FormItem>
         <FormItem label="采购类型:">

src/views/PurchasingManage/QualitycontrolOrder/list.vue

@@ -17,6 +17,7 @@
         <FormItem label="订单号:">
           <Input type="text"
                  size="small"
+                 clearable
                  v-model="searchData.order_no"
                  style="width: 150px"
                  placeholder="订单号" />

src/views/PurchasingManage/RequisitionOrder/list.vue

@@ -17,6 +17,7 @@
         <FormItem label="订单号:">
           <Input type="text"
                  size="small"
+                 clearable
                  v-model="searchData.order_no"
                  style="width: 150px"
                  placeholder="订单号" />
@@ -24,6 +25,7 @@
         <FormItem label="项目名称:">
           <Input type="text"
                  size="small"
+                 clearable
                  v-model="searchData.project_title"
                  style="width: 150px"
                  placeholder="项目名称" />

src/views/Warehouse/FirstInventory/list.vue

@@ -416,7 +416,7 @@ export default {
       this.getData(this.proxyObj)
     },
     async exportData () {
-      const res = await this.axios('/api/measure_orders_export', { params: { ...this.proxyObj } })
+      const res = await this.axios('/api/stock_begin_export', { params: { ...this.proxyObj } })
       if (res.code == 200) {
         let url = `${this.$store.state.ip}/api/storage/${res.data.file}`
         location.href = url