Jelajahi Sumber

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

Andy 3 tahun lalu
induk
melakukan
63cf17b1ac

+ 3 - 2
src/views/BidSystem/ContractList/info.vue

@@ -335,9 +335,9 @@
                   size="small"
                   style="width:120px"
                 >
-                  <Option label="未下深化" :value="1"></Option>
+                  <Option label="未下深化" :value="0"></Option>
                   <Option label="深化中" :value="1"></Option>
-                  <Option label="深化完成" :value="0"></Option>
+                  <Option label="深化完成" :value="2"></Option>
                 </Select>
               </FormItem>
               <FormItem>
@@ -1658,6 +1658,7 @@ export default {
           },
         })
         .then((res) => {
+          console.log(res)
           this.listTableData = res.data.data;
           this.area_no_list = res.data.area_no;
           this.area_title_list = res.data.area_title;

+ 2 - 2
src/views/BidSystem/ProductDeOrder/detail.vue

@@ -173,12 +173,12 @@
             </Select>
           </template>
           <template slot="supSet" slot-scope="{ row, index }">
-            <!-- <a
+            <a
               style="margin: 0 5px; color: red"
               v-show="$route.query.type != 3"
               @click="handleSupSet(row, index)"
               >删除</a
-            > -->
+            >
           </template>
         </Table>
       </div>

+ 150 - 3
src/views/MaterialMannage/edit.vue

@@ -56,7 +56,8 @@
           v-model="info.unit"
           placeholder="请输入单位"
         />
-      </FormItem>
+      </FormItem> 
+     
       <FormItem label="损耗(%)" v-show="info.detail.length == 0" prop="scale">
         <Input
           type="number"
@@ -71,7 +72,54 @@
           v-model="info.remark"
           placeholder="请输入描述"
         />
-      </FormItem>
+      </FormItem> 
+      <FormItem label="上传附件:">
+          <div class="product-img">
+            <div class="product-add">
+              <div class="img_items" v-if="this.info.img_url !== ''">
+                <img
+                  @click="looks(info.img_url)"
+                  :src="$store.state.ip + this.info.img_url"
+                  alt=""
+                />
+                <Icon
+                  v-if="type != 3"
+                  size="20"
+                  @click="delItems( )"
+                  class="delete-img"
+                  type="ios-close-circle"
+                />
+              </div>
+              <div class="add-items" v-if="type != 3&&!info.img_url">
+                <div class="item">
+                  <Icon size="50" type="ios-add" />
+                </div>
+                <span>支持jpg/png格式</span>
+                <input
+                  @change="changeIpt($event, info.img_url)"
+                  type="file"
+                  class="ipt"
+                />
+              </div>
+            </div>
+          </div>
+          <!-- <Button type="primary"
+                  style="margin-right:10px;"
+                  ghost>上传附件</Button> -->
+          <!-- <Upload style="display: inline"
+                  name="your_file"
+                  :show-upload-list="false"
+                  :headers="headers"
+                  multiple
+                  :data="uploadData"
+                  :on-error="uploadError"
+                  :on-progress="onProgress"
+                  :on-success="uploadSuccess"
+                  :action="$store.state.ip + '/api/deep_img_import'">
+            <Button type="primary"
+                    style="margin-right: 10px">上传附件</Button>
+          </Upload> -->
+        </FormItem>
       <FormItem label="安全库存" v-show="isShowInfoMinStock" prop="stock">
         <Input
           type="number"
@@ -162,7 +210,8 @@
               v-model="rows.price"
               placeholder="请输入金额"
             />
-          </FormItem>
+          </FormItem>  
+         
           <FormItem label="操作" v-if="isShowDetailBtn">
             <div
               style="width:100%;display:flex;height:100%;align-items:center;"
@@ -184,6 +233,7 @@
               >
             </div>
           </FormItem>
+         
         </Form>
       </div>
     </div>
@@ -209,6 +259,7 @@ export default {
       type: 1,
       info: {
         m_id: "",
+        img_url:'',
         detail: [
           {
             long: "",
@@ -263,6 +314,7 @@ export default {
       : this.info.m_id;
     this.axios("/api/basics_material_index").then((res) => {
       this.materialList = res.data.data;
+      console.log(res)
     });
     if (this.id) {
       this.getData(this.id);
@@ -327,8 +379,38 @@ export default {
     },
   },
   methods: {
+     looks(img) {
+      const array = [{ img_url: img }];
+      this.$previewImg({
+        list: array,
+        baseUrl: this.$store.state.ip,
+        baseImgField: "img_url",
+        baseTitleField: "",
+      });
+    },
+ delItems() {
+      this.info.img_url = '';
+      this.$forceUpdate();
+    },
+ changeIpt(e, row) {
+      // if (this.info.img.length >= 3) {
+      //   return this.$Message.warning("图片最多上传3张");
+      // }
+      let file = e.target.files[0];
+      this.postImg(file, row);
+      e.target.value = null;
+    },
+     postImg(file, row) {
+      let formData = new FormData();
+      formData.append("file", file);
+      this.axios.post("/api/upload_pic", formData).then((res) => {
+        this.info.img_url = res.data.url;
+        this.$forceUpdate();
+      });
+    },
     getData(id) {
       this.axios("/api/material", { params: { id: id } }).then((res) => {
+        console.log(res)
         let data = res.data.shift();
         this.info = data;
         if (this.info.detail.length < 1) {
@@ -354,6 +436,7 @@ export default {
         (this.info.detail[0].price = this.info.price));
       type == 4 ? (this.info.id = "") : "";
       this.axios.post("/api/material", this.info).then((res) => {
+        console.log(this.info)
         if (res.code == 200) {
           this.$Message.success(res.msg);
           this.back();
@@ -408,4 +491,68 @@ export default {
   position: relative;
   margin: 20px 0;
 }
+.product-img {
+  padding-top: 10px;
+}
+.product-add {
+  padding: 10px 0;
+  // display: flex;
+  flex-wrap: nowrap;
+  .ipt {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    opacity: 0;
+    cursor: pointer;
+    outline: none;
+    top: 0;
+    left: 0;
+  }
+  .add-items {
+    width: 120px;
+    height: 120px;
+    border: 1px dotted #e7e7e7;
+    border-radius: 5px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    overflow: hidden;
+    position: relative;
+    flex-direction: column;
+    background: #f4f5f7;
+    .item {
+      width: 46px;
+      height: 46px;
+      background: #3764ff;
+      opacity: 0.6;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-radius: 50%;
+      color: #fff;
+    }
+  }
+  .img_items {
+    width: 120px;
+    height: 120px;
+    margin-bottom: 10px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #e7e7e7;
+    margin-right: 10px;
+    border-radius: 5px;
+    position: relative;
+    img {
+      max-width: 108px;
+      max-height: 108px;
+    }
+  }
+}
+.delete-img {
+  position: absolute;
+  right: 0px;
+  top: 0px;
+  color: red;
+}
 </style>

+ 2 - 1
src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -2814,7 +2814,8 @@ export default {
     },
     print(){
       this.$router.push({path:"/cms/ordermannage/businessorderlist/printlist",query:{
-       order_no:this.$route.query.order_no
+       order_no:this.$route.query.order_no,
+       box_id:this.info.box_id
       }})
     },
     back() {

+ 5 - 3
src/views/OrderMannage/BusinessOrderlist/printlist.vue

@@ -183,8 +183,8 @@
                 <tr>
                     <td colspan="23" style="border: 0;">
                         <div class="table-header">
-                            <img class="left-img" :src='showTable.logo' alt="" v-show="showTable.logo?true:false">
-                            <h1 class="table-title">{{showTable.title}}</h1><img class="right-img1" :src='showTable.right_logo1' alt="" v-show="showTable.right_logo1?true:false"><img class="right-img2" :src='showTable.right_logo2' alt="" v-show="showTable.right_logo2?true:false">
+                            <img class="left-img" :src='$store.state.ip + showTable.logo' alt="" v-show="showTable.logo?true:false">
+                            <h1 class="table-title">{{showTable.title}}</h1><img class="right-img1" :src='$store.state.ip + showTable.right_logo1' alt="" v-show="showTable.right_logo1?true:false"><img class="right-img2" :src='$store.state.ip + showTable.right_logo2' alt="" v-show="showTable.right_logo2?true:false">
                         </div>
                     </td>
                 </tr>
@@ -374,9 +374,11 @@ export default {
             method:'get',
             url:'/api/printe_order_detail',
             params:{
-                order_no:this.$route.query.order_no
+                order_no:this.$route.query.order_no,
+                box_id:this.$route.query.box_id
             }
         }).then(res=>{
+            console.log(res)
             this.showTableContentStr = res.msg.list
             this.showTable = res.msg
             this.newArr = this.chunk(this.showTableContentStr,15)

+ 3 - 3
src/views/ProductionOrderList/Dispatchlist/list.vue

@@ -119,9 +119,9 @@ export default {
         {
           title: '派工状态', name: 'Select', placeholder: '请选择', serverName: 'state', value: '',
           option: [
-            { label: '未生产', value: 1 },
-            { label: '生产中', value: 2 },
-            { label: '生产完成', value: 3 },
+            { label: '未生产', value: 0 },
+            { label: '生产中', value: 1 },
+            { label: '生产完成', value: 2 },
           ]
         },
         { title: '开始派工时间', name: 'Input', start_server: 'start_time', end_server: 'end_time', start_value: '', end_value: '', isDate: true, serverName: 'id2', start_placeholder: '开始日期', end_placeholder: '结束日期' },

+ 9 - 11
src/views/ProductionOrderList/ProductionPlanlist/details.vue

@@ -107,7 +107,7 @@ export default {
           name: "Select",
           multiple: true,
           filterable: true,
-          value: "",
+          value: '',
           serverName: "part",
           placeholder: "请选择部件",
           option: [{ label: 1, value: 1 }],
@@ -137,17 +137,16 @@ export default {
           multiple: true,
           filterable: true,
           value: "",
-          serverName: "img_number",
+          serverName: "url_number",
           placeholder: "请选择图号",
           option: [],
         },
          {
           title: "是否完成",
           name: "Select",
-          multiple: true,
           filterable: true,
           value: "",
-          serverName: "img_number",
+          serverName: "sub_state",
           placeholder: " ",
           option: [{ label: '否', value: 0 },{ label: '是', value: 1 }],
         },
@@ -340,11 +339,11 @@ export default {
           (v.value = v.title), (v.label = v.title);
         });
         res.data.url_number.map((v) => {
-          var j = {};
-          j.value = v;
-          j.label = v;
-          j.title = v;
-          this.arrList.push(j);
+          var j = {value:'',label:'',title:''};
+          j.value = v.url_number;
+          j.label = v.url_number;
+          j.title = v.url_number;
+          this.arrList.push(j)
         });
         this.list[0].option = res.data.house;
         this.list[1].option = res.data.unit;
@@ -361,9 +360,8 @@ export default {
       this.$router.go(-1);
     },
     getData(row) {
-      this.axios("/api/orders_procedure_list", { params: row }).then((res) => {
+      this.axios.get("/api/orders_procedure_list", { params: row }).then((res) => {
         this.logList = res.data.detail;
-        console.log(res)
         this.tableData = res.data.list;
         this.total = res.data.total;
       });

+ 1 - 1
src/views/ProductionOrderList/ProductionPlanlist/list.vue

@@ -148,7 +148,7 @@ export default {
                 : params.row.state == 1
                 ? "已派工"
                 : params.row.state == 2
-                ? "完"
+                ? "完"
                 : ""
             ),
         },