tijiao

build/utils.js

@@ -19,7 +19,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
 let devModules = ['all'];
-// let devModules = ['index','inward','appoint','sale']
+// let devModules = ['index','inward','SporadicManage']
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/enFactory.vue

@@ -1,137 +1,43 @@
 //进厂
-// 零星物资进厂
 <template>
-  <div class="enFactory">
-    <div class="enFactory_top">
+  <!-- 零星物资进厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <div class="enFactory_bottom">
-      <dilTable v-bind.sync="option" ref="table">
-        <el-table-column fixed="right" label="操作" width="100">
-          <template slot-scope="scope">
-            <el-button @click="detailclick(scope.row)" type="text">
-              物资详情
-            </el-button>
-          </template>
-        </el-table-column>
-        <!-- 物资详情 -->
-        <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
-              <div v-if="false">{{ props }}</div>
-              <div>
-                <el-table :data="tableData">
-                  <el-table-column
-                    v-for="(item, i) in tableHead"
-                    :key="i"
-                    :prop="item.prop"
-                    :label="item.label"
-                    :width="item.width"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </el-form>
-          </template>
-        </el-table-column>
-      </dilTable>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
   </div>
 </template>
 
 <script>
 export default {
+  name: "homeworkPath",
   data() {
     return {
-      //输入框的值
       input: "",
       option: {
-        requestUrl:
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3",
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=13",
       },
-      //物资信息的数据
-      tableData: [],
-      //物资信息的表头
-      tableHead: [
-        {
-          prop: "materialName",
-          label: "物资名称",
-          width: 200,
-        },
-        {
-          prop: "materialModel",
-          label: "规格型号",
-          width: 200,
-        },
-        {
-          prop: "weightNum",
-          label: "物资数量",
-          width: 200,
-        },
-      ],
-      //记录旧的row对象
-      oldRow: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
-      oldRowCount: 1,
     };
   },
   methods: {
-    // 查看物资详情
-    detailclick(row) {
-      // 记录重复点击次数
-      if (this.oldRow === row) {
-        this.oldRowCount += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow != "") {
-        if (this.oldRow != row) {
-          if (this.oldRowCount % 2 === 1) {
-            this.$refs.table.toggleRowExpansion(this.oldRow);
-          } else {
-            this.oldRowCount = 1;
-          }
-        } else {
-          this.oldRow = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow = row;
-      this.materialDetails(row.orderId);
-    },
-    //框计算
     onclick() {
-      this.option.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId= &type=2&con=" + this.input;
-    },
-    //查看当前订单的物资信息
-    materialDetails(orderId) {
-      this.$axios
-        .post("/api/v1/uc/getOrderMaterialMesByOrderId/" + orderId)
-        .then((res) => {
-          if (res.data.code == "200") {
-            this.tableData = res.data.data;
-          }
-        });
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=5&con=" + this.input;
     },
   },
 };
 </script>
-
-<style lang="scss">
-.enFactory {
-  .enFactory_top {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
     .el-input{
-        width: 20%;
+      width: 20%;
     }
   }
 }

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/grossWeight.vue

@@ -1,52 +1,43 @@
-//毛重
-//毛重
+//计毛
 <template>
-  <div class="grossWeight">
-    <div class="grossWeight_top">
+  <!-- 零星物资计毛作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <div class="grossWeight_bottom">
-      <dilTable v-bind.sync="option">
-      </dilTable>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
   </div>
 </template>
 
 <script>
 export default {
+  name: "homeworkPath",
   data() {
     return {
-      //输入框的值
       input: "",
       option: {
-        requestUrl:
-          "",
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=12",
       },
     };
   },
   methods: {
-    //框计算
     onclick() {
-      this.option.requestUrl =
-        "&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=12&con=" + this.input;
     },
   },
 };
 </script>
-
-<style lang="scss">
-.grossWeight {
-  .grossWeight_top {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
     .el-input{
-        width: 20%;
+      width: 20%;
     }
   }
 }

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/load.vue

@@ -1,52 +1,43 @@
-//装货
-//装货
+//卸货
 <template>
-  <div class="load">
-    <div class="load_top">
+  <!-- 零星物资卸货卸货实绩页面 -->
+  <div class="homeworkPath">
+   <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
-    <div class="load_bottom">
-      <dilTable v-bind.sync="option">
-      </dilTable>
-    </div>
+    <dilTable v-bind.sync="option"></dilTable>
   </div>
 </template>
 
 <script>
 export default {
+  name: "homeworkPath",
   data() {
     return {
-      //输入框的值
+      restaurants: [],
       input: "",
       option: {
-        requestUrl:
-          "",
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=389&orderType=12",
       },
     };
   },
   methods: {
-    //框计算
     onclick() {
-      this.option.requestUrl =
-        "&con=" + this.input;
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=12&con=" + this.input;
     },
-  },
+   }
 };
 </script>
-
-<style lang="scss">
-.load {
-  .load_top {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
     .el-input{
-        width: 20%;
+      width: 20%;
     }
   }
 }

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/outFactory.vue

@@ -1,137 +1,43 @@
 //出厂
-// 零星物资出厂
 <template>
-  <div class="outFactory">
-    <div class="outFactory_top">
+  <!-- 零星物资出厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <div class="outFactory_bottom">
-      <dilTable v-bind.sync="option" ref="table">
-        <el-table-column fixed="right" label="操作" width="100">
-          <template slot-scope="scope">
-            <el-button @click="detailclick(scope.row)" type="text">
-              物资详情
-            </el-button>
-          </template>
-        </el-table-column>
-        <!-- 物资详情 -->
-        <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
-              <div v-if="false">{{ props }}</div>
-              <div>
-                <el-table :data="tableData">
-                  <el-table-column
-                    v-for="(item, i) in tableHead"
-                    :key="i"
-                    :prop="item.prop"
-                    :label="item.label"
-                    :width="item.width"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </el-form>
-          </template>
-        </el-table-column>
-      </dilTable>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
   </div>
 </template>
 
 <script>
 export default {
+  name: "homeworkPath",
   data() {
     return {
-      //输入框的值
       input: "",
       option: {
-        requestUrl:
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3",
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=388&orderType=12",
       },
-      //物资信息的数据
-      tableData: [],
-      //物资信息的表头
-      tableHead: [
-        {
-          prop: "materialName",
-          label: "物资名称",
-          width: 200,
-        },
-        {
-          prop: "materialModel",
-          label: "规格型号",
-          width: 200,
-        },
-        {
-          prop: "weightNum",
-          label: "物资数量",
-          width: 200,
-        },
-      ],
-      //记录旧的row对象
-      oldRow: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
-      oldRowCount: 1,
     };
   },
   methods: {
-    // 查看物资详情
-    detailclick(row) {
-      // 记录重复点击次数
-      if (this.oldRow === row) {
-        this.oldRowCount += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow != "") {
-        if (this.oldRow != row) {
-          if (this.oldRowCount % 2 === 1) {
-            this.$refs.table.toggleRowExpansion(this.oldRow);
-          } else {
-            this.oldRowCount = 1;
-          }
-        } else {
-          this.oldRow = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow = row;
-      this.materialDetails(row.orderId);
-    },
-    //框计算
     onclick() {
-      this.option.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId= &type=2&con=" + this.input;
-    },
-    //查看当前订单的物资信息
-    materialDetails(orderId) {
-      this.$axios
-        .post("/api/v1/uc/getOrderMaterialMesByOrderId/" + orderId)
-        .then((res) => {
-          if (res.data.code == "200") {
-            this.tableData = res.data.data;
-          }
-        });
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=388&orderType=12&con=" + this.input;
     },
   },
 };
 </script>
-
-<style lang="scss">
-.outFactory {
-  .outFactory_top {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
     .el-input{
-        width: 20%;
+      width: 20%;
     }
   }
 }

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/tareWeight.vue

@@ -1,49 +1,43 @@
 //计皮
-//计皮
 <template>
-  <div class="tareWeight">
-    <div class="tareWeight_top">
+  <!-- 零星物资计皮作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <div class="tareWeight_bottom">
-      <dilTable v-bind.sync="option"> </dilTable>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
   </div>
 </template>
 
 <script>
 export default {
+  name: "homeworkPath",
   data() {
     return {
-      //输入框的值
       input: "",
       option: {
-        requestUrl: "",
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12",
       },
     };
   },
   methods: {
-    //框计算
     onclick() {
-      this.option.requestUrl = "&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12&con=" + this.input;
     },
   },
 };
 </script>
-
-<style lang="scss">
-.tareWeight {
-  .tareWeight_top {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
     .el-input{
-        width: 20%;
+      width: 20%;
     }
   }
 }

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -13,11 +13,6 @@
       <el-input v-model="receiveName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
-    <div class="forwardingUnit from">
-      <span class="text">卸货点：</span>
-      <el-input v-model="unloadPointName" disabled> </el-input>
-      <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
-    </div>
     <div class="orderType from">
       <span class="text">流向：</span>
       <el-select v-model="orderType" placeholder="请选择">
@@ -103,6 +98,13 @@
           <!-- 插入输入框 -->
           <template slot-scope="scope">
             <template v-if="item.slot">
+                <!-- 装卸货优先级 -->
+               <template v-if="item.prop == 'materialPriority'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.materialPriority"
+                ></el-input>
+              </template
               <!-- 物资件数 -->
               <template v-if="item.prop == 'orderMaterialNumber'">
                 <el-input
@@ -116,13 +118,7 @@
                   v-model.number="scope.row.orderMaterialWeight"
                 ></el-input>
               </template>
-              <!-- 装卸货优先级 -->
-               <template v-if="item.prop == 'materialPriority'">
-                <el-input
-                  class="textinput"
-                  v-model.number="scope.row.materialPriority"
-                ></el-input>
-              </template>
+            
             </template>
             <template v-else>
               <span>{{ scope.row[item.prop] }}</span>
@@ -470,7 +466,8 @@ export default {
       this.unloadPointName = selection.warehouseName;
     },
     currentRadioChange5(selection) {
-      this.lineName = selection.lineName;
+      console.log(selection)
+      this.lineName = selection.lineName+selection.lineDesk 
       this.lineId = selection.lineId;
     },
     currentRadioChange3(selection) {

src/views/inward/components/truckAppoint/addRequirement.vue

@@ -23,6 +23,26 @@
           </el-form-item>
         </el-form>
       </div>
+      <div class="form-box f2">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="发货单位">
+            <el-input v-model="supplierName" disabled> </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" disabled>发货单位</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="form-box f2">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="收货单位">
+            <el-input v-model="shipperName" disabled> </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" disabled>收货单位</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
       <div class="form-box f4">
         <el-form :inline="true" class="demo-form-inline">
           <el-form-item label="物资名称">
@@ -35,7 +55,7 @@
       </div>
       <div class="form-box f5">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label="用车地点">
+          <el-form-item label="装车点">
             <el-input v-model="truckPoint" disabled> </el-input>
           </el-form-item>
           <el-form-item>
@@ -45,7 +65,7 @@
       </div>
       <div class="form-box f5">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label="卸货地点">
+          <el-form-item label="卸车点">
             <el-input v-model="truckPoint1" disabled> </el-input>
           </el-form-item>
           <el-form-item>
@@ -53,16 +73,6 @@
           </el-form-item>
         </el-form>
       </div>
-      <div class="form-box f5">
-        <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label="装货月台">
-            <el-input v-model="requirementPlatformName" disabled> </el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
       <div class="form-box">
         <dil-form :formId="300" v-model="form"></dil-form>
       </div>
@@ -127,15 +137,16 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      purchaseOrder: "",
-      foreignShipName: "",
-      materialName: "",
+      purchaseOrder: null,
+      foreignShipName: null,
+      materialName:null,
+      shipperName:null,
+      supplierName:null,
       a: 1,
       direction: "rtl",
       input: "",
-      truckPoint: "",
-      truckPoint1:'',
-      requirementPlatformName: "",
+      truckPoint: null,
+      truckPoint1:null,
       drawer: false,
       form: {},
       second: {
@@ -183,22 +194,37 @@ export default {
       this.mapList1 = selection
       this.purchaseOrder = this.mapList1.purchaseOrderNo
       this.foreignShipName = this.mapList1.resultForeignShipName
+      this.supplierName = this.mapList1.supplierName
+      this.shipperName = this.mapList1.shipperName
       this.materialName = this.mapList1.materialName;
     },
     currentRadioChange2(selection) {
       this.mapList2 = selection
-      this.truckPoint = this.mapList2.wareHouseName;
+      console.log(this.mapList2)
+      var s1 = "";
+      this.truckPoint= s1.concat(this.mapList2.companyBranchName,this.mapList2.companyBranchName,this.mapList2.wareHouseName)
+       this.mapList2.companyBranchName+' '+this.mapList2.companyBranchName+this.mapList2.wareHouseName
     },
     currentRadioChange3(selection) {
       this.mapList3 = selection
-      this.truckPoint1 = this.mapList3.wareHouseName;
+      this.truckPoint1 = this.mapList3.companyBranchName+this.mapList3.companyBranchName+this.mapList3.wareHouseName
     },
-    currentRadioChange4(selection) {
-      this.mapList4 = selection
-      this.requirementPlatformName = this.mapList4.wareHouseName;
     },
     // 新增
     makeSure() {
+      console.log(this.form.materialNumber)
+      console.log(this.form.materialWeight);
+      console.log(typeof(this.form.materialNumber));
+      if(this.purchaseOrder == null){
+          this.$alert('没有选择采购订单，请点击浏览选择采购订单')         
+      }else if(this.truckPoint == null){
+          this.$alert('没有选择用车地点，请点击浏览选择用车地点')
+      }else if(this.truckPoint1 == null){
+          this.$alert('没有选择卸货点，请点击浏览选择卸货点')
+      }
+      // }else if(typeof(this.form.materialNumber) =="undefined"&typeof(this.form.materialWeight) =="undefined"){
+      //     this.$alert('请输入物资数量或者物资重量')
+      // }
       let requiremnet = {
         purchaseOrderId: this.mapList1.purchaseOrderId,
         requiremntUnitId: this.mapList2.wareHouseId,
@@ -213,8 +239,7 @@ export default {
         requirementWorkContent: this.form.requirementWorkContent,
         requirementWorkEnvironment: this.form.requirementWorkEnvironment,
         requirementWorkType: this.form.requirementWorkType,
-        requirementUnloadUnitId:this.mapList3.wareHouseId,
-        requirementPlatformId: this.mapList4.wareHouseId
+        requirementUnloadUnitId:this.mapList3.wareHouseId
       };
       console.log(requiremnet);
       this.axios
@@ -235,7 +260,7 @@ export default {
     cancel() {
       this.$router.go(-1);
     },
-  },
+  
 };
 </script>