bug

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

@@ -76,14 +76,6 @@
             <span v-else>{{ formData.front_money }}</span>
           </FormItem>
           <FormItem label="详细地址:">
-<<<<<<< HEAD
-            <Input v-if="type == 6" v-model="saveData.address" placeholder="请输入详细地址"/>
-            <span v-else>{{ formData.address }}</span>
-          </FormItem>
-          <FormItem label="手机号:">
-            <Input v-if="type == 6" v-model="saveData.mobile" placeholder="请输入手机号"/>
-            <span v-else>{{ formData.mobile }}</span>
-=======
             <Select
               clearable
               filterable
@@ -125,7 +117,6 @@
                   )[0].mobile
                 : formData.mobile
             }}</span>
->>>>>>> bb26b73bdc2f7f4f4275f4231f9227b5edd5076f
           </FormItem>
           <FormItem label="开始日期:">
             <DatePicker
@@ -513,7 +504,6 @@
               <Button size="small" type="primary" ghost>导入</Button>
             </Upload>
           </div>
->>>>>>> bb26b73bdc2f7f4f4275f4231f9227b5edd5076f
         </Tabs>
       </Card>
     </div>
@@ -695,7 +685,7 @@ export default {
         url_number: [],
         product_title: [],
         material: "",
-        color: "",
+        color: '',
         work: "",
         state: "",
       },
@@ -757,6 +747,9 @@ export default {
     }
   },
   methods: {
+    handleBeforeUpload(){
+
+    },
     handleClientDetailChange(val) {
       val && (this.info.custom_detail_id = val);
     },

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

vue.config.js

@@ -1,6 +1,7 @@
 const axios_default_ip =
     process.env.NODE_ENV == 'dev' ?
-    'http://121.37.173.82:82' :
+    // 'http://121.37.173.82:82'
+    'http://121.41.102.225:82' :
     process.env.NODE_ENV == 'test-prd' ?
     'http://121.41.102.225:82' //测试服
     :