Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -21,7 +21,6 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "WMS", "inward"];
 // let devModules = ["index", "inward", "WMS", "queue"];
 let devModules = ["all"];
-
 //let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS",'statisticalReport'];
 
 if (pathSrc.indexOf("node_modules") > -1) {

config/index.js

@@ -66,7 +66,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:80",
-    // target: "http://localhost:8080",
+    //target: "http://localhost:8080",
     // target: "http://192.168.1.101:8080",
     ws: true,
     pathRewrite: {

src/views/RMS/components/addOilPrice.vue

@@ -26,7 +26,7 @@
       :visible.sync="dialogVisible"
       width="30%"
     >
-      <span>注：<span style="color:red;">不能输入特殊符号('#')</span></span>
+      <span>注：<span style="color:red;">建议不能输入特殊符号</span></span>
       <el-input v-model="input" placeholder="请输入内容"></el-input>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
@@ -90,7 +90,7 @@ export default {
         })
       }else{
         this.$message.warning('请输入油品名称')
-      } 
+      }
     },
     makeSure() {
       this.loading = true;
@@ -102,7 +102,7 @@ export default {
       }else if(!isNumber(this.form1.priceValue)){
         this.$message.warning('油品价格必修为整数或者小数')
       }else{
-        state = true;            
+        state = true;
       }
       if(state){
         let RmsOilPrice = {
@@ -176,4 +176,4 @@ export default {
     justify-content: center;
   }
 }
-</style>
+</style>

src/views/RMS/components/oilPrice.vue

@@ -1,5 +1,6 @@
 //资源管理油价管理
 <template>
+  <!-- -->
   <div class="steel_inbound">
     <div class="sache">
       <el-input
@@ -82,7 +83,9 @@ export default {
       this.isKuang = true;
       this.selectLoading = true;
       this.tableLoading = true;
-      if(this.textInput){
+      if(this.textInput!=null){
+        this.textInput=this.textInput.replace('#','%23')
+        this.textInput=this.textInput.replace('%','%25')
         this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&con=" +this.textInput+"&i="+ new Date();
       }else{
         this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&i="+ new Date();

src/views/appoint/components/saleContract/addTransportPrice.vue

@@ -5,7 +5,7 @@
     <div class="form">
       <div class="form_box">
         <dil-form :formId="287" v-model="form1" ref="from1"></dil-form>
-      </div> 
+      </div>
       <div class="liulan">
           <el-button type="primary" class="btn" @click="oilPriceFormulaClick">浏览</el-button>
           <el-button type="primary" class="btn1" @click="ondrawerOut">选择</el-button>
@@ -55,7 +55,7 @@
       </div>
       <div class="LineTable">
         <vue-scroll :ops="ops" style="width:100%;height:100%">
-          <dilTable 
+          <dilTable
             v-bind.sync="oilPriceFormula"
             @radio-change="currentRadioChange"
             :isKuang="isKuang"
@@ -172,6 +172,7 @@ export default {
         priceDate:new Date(),
         oilTypeId:10,
         capacityTypeId:1,
+        type: "销售钢材"
       },
       //提交给后端的数据
       // map:{},
@@ -318,7 +319,7 @@ export default {
       };
     },
     //以上是收货地址边输边查搜索
-    
+
     //选定联动公式确定
     addoilPriceFormula(){
       let mapvalue = {
@@ -394,7 +395,7 @@ export default {
             type: "success",
             message: "新增运输单价成功!",
           });
-        });   
+        });
     },
     // 取消
     cancel() {
@@ -447,13 +448,14 @@ export default {
       margin-top: 30px;
       .el-button{
         width: 100px !important;
-        margin: auto;
+        //margin: auto;
       }
       .btn{
-        margin-top: 105px;
+        margin-top: 110px;
       }
       .btn1{
         margin-top: 13px;
+        margin-left: 0px;
       }
       .btn2{
         margin-top: 67px;
@@ -483,4 +485,4 @@ export default {
   /deep/.__bar-is-horizontal {
     display: none !important;
   }
-</style>
+</style>

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -137,7 +137,8 @@
             </el-table-column>
             <el-table-column label="装货点" width="100">
               <template slot-scope="scope">
-                <el-select size="mini" v-model="scope.row.id">
+                <el-select size="mini" v-model="scope.row.id"
+                @change="changePriority($event,scope.row.id)">
                   <el-option
                     v-for="item in option"
                     :key="item.id"
@@ -245,10 +246,8 @@
         <el-tab-pane label="仓库排队列表" name="third">
           <el-table
             :data="tableData3"
-            :span-method="objectSpanMethod"
             border
             style="width: 100%; margin-top: 20px"
-            @selection-change="handleSelectionChange"
             max-height="500px"
           >
             <el-table-column prop="warehouseName" label="仓库" fit></el-table-column>
@@ -310,6 +309,7 @@ export default {
     this.infomation();
     this.getSpellingArray();
     this.getNoSpellingArray();
+    this.getStoreArray();
     this.getSteelOrderNum();
     this.wantEnfactory();
     this.start();
@@ -363,6 +363,7 @@ export default {
       this.getSpellingArray();
       this.getNoSpellingArray();
       this.getSteelOrderNum();
+      this.getStoreArray();
       this.redDotNum = null;
       this.totalQueueNum = null;
       this.totalQueueNumFirst = null;
@@ -537,7 +538,7 @@ export default {
         )
         .then(res => {
           this.tableData3 = res.data.data;
-          console.log("getStoreArray "+this.tableData3);
+          console.log("getStoreArray "+JSON.stringify(this.tableData3));
         });
     },
     onclick() {
@@ -634,6 +635,7 @@ export default {
           this.$refs.mutiData.clearSelection();
           this.getNoSpellingArray();
           this.getSpellingArray();
+          this.getStoreArray();
           this.redDotNum = null;
           this.totalQueueNum = null;
           this.totalQueueNumFirst = null;
@@ -646,6 +648,7 @@ export default {
           this.$refs.mutiData.clearSelection();
           this.getNoSpellingArray();
           this.getSpellingArray();
+          this.getStoreArray();
           this.redDotNum = null;
           this.totalQueueNum = null;
           this.totalQueueNumFirst = null;
@@ -654,6 +657,11 @@ export default {
           this.start();
         }
       });
+    },
+    changePriority(value,s){
+      console.log("装货点："+value)
+      console.log("数据第几行:"+s)
+      //this.axios.post("")
     }
   }
 };

src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -51,8 +51,8 @@
               <th style="width: 23.5%; text-align: center">物资名称</th>
               <th style="width: 22.5%; text-align: center">规格型号</th>
               <th style="width: 14%">件数</th>
-              <th style="width: 14%">重量</th>
-              <th style="width: 21%">订单日期</th>
+              <th style="width: 35%">重量</th>
+<!--              <th style="width: 21%">订单日期</th>-->
             </tr>
             <tr v-for="(item, index) in deliveryOrderMaterialList" :key="index">
               <td>{{ index + 1 }}</td>
@@ -60,7 +60,7 @@
               <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
               <td>{{ item.materialNumber }}</td>
               <td>{{ item.materialWeight }}</td>
-              <td>{{ item.makeDate }}</td>
+<!--              <td>{{ item.makeDate }}</td>-->
             </tr>
           </table>
 

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckSteelDetails.vue

@@ -57,11 +57,6 @@
       </el-tabs>
     </div>
     <!-- 修改详单单价弹出框 -->
-    <el-dialog
-      title="修改详单地址"
-      :visible.sync="dialogFormVisible"
-      append-to-body
-    >
       <!-- 内层单价选择弹出框 -->
 <!--      <el-dialog
         width="40%"
@@ -125,9 +120,15 @@
       </el-dialog>-->
       <!-- 内层单价选择弹出框 -->
 
-      <el-form>
-        <el-form-item label="原详单地址" :label-width="formLabelWidth">
-          <el-input
+      <!--append-to-body-->
+      <el-drawer
+        title="修改详单地址"
+        :visible.sync="dialogFormVisible"
+        size="40%"
+        >
+<!--        <el-form-item label="原详单地址" :label-width="formLabelWidth">-->
+        原详单地址
+        <el-input
             style="width:250px"
             v-model="originalAddress"
             disabled
@@ -138,7 +139,8 @@
             v-model="originalPriceValue"
             disabled
           ></el-input>
-        </el-form-item>
+<!--        </el-form-item>-->
+        <!---->
         <el-input
           v-model="addresText"
           placeholder="请输入内容"
@@ -174,12 +176,14 @@
             >浏览</el-button
           >
         </el-form-item>-->
-      </el-form>
-      <div slot="footer" class="dialog-footer">
+
+        <!-- class="dialog-footer" slot="footer"-->
+      <div class="opreation">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
         <el-button type="primary" @click="makeSure">确 定</el-button>
       </div>
-    </el-dialog>
+
+      </el-drawer>
     <!-- 增加途损 -->
     <el-dialog title="增加途损" width="30%" :visible.sync="dialogDamage">
       <el-form>
@@ -199,6 +203,7 @@
       </div>
     </el-dialog>
   </div>
+
 </template>
 
 <script>
@@ -558,4 +563,8 @@ export default {
     }
   }
 }
+.opreation{
+  width: 300px;
+  height: 200px;
+}
 </style>