look hace 3 años
padre
commit
401e6f141c

+ 0 - 17
src/api/order/orderDetail.js

@@ -41,23 +41,6 @@ export function getAddressInfo(data) {
     params: data
   })
 }
-// 前台获取发货区域List
-export function getshipAreaListInfo(data) {
-  return request({
-    url: '/doc/getAllShipAreaEnable',
-    method: 'post',
-    params: data
-  })
-}
-
-// 前台获取发货方式
-export function getshipModeListInfo(data) {
-  return request({
-    url: '/doc/getAllShipModeEnable',
-    method: 'post',
-    params: data
-  })
-}
 // 前台获取发货方式
 export function getLogisticsInfoList(data) {
   return request({

+ 0 - 24
src/api/order/orderList.js

@@ -49,30 +49,6 @@ export function getOrderMessageList(data) {
   })
 }
 
-// 获取订单发货通知
-export function getOrderDeliverInform(data) {
-  return request({
-    url: '/order/v1/getOrderDeliverInform',
-    method: 'post',
-    params: data
-  })
-}
-// 前台获取发货区域List
-export function getshipAreaListInfo(data) {
-  return request({
-    url: '/doc/getAllShipAreaEnable',
-    method: 'post',
-    params: data
-  })
-}
-// 前台获取发货方式
-export function getshipModeListInfo(data) {
-  return request({
-    url: '/doc/getAllShipModeEnable',
-    method: 'post',
-    params: data
-  })
-}
 // 修改发货通知
 export function editOrderDeliverInform(data) {
   return request({

+ 162 - 280
src/views/order/orderList/component/ordermis.vue

@@ -39,51 +39,109 @@
           <span v-else style="color: red;font-weight: 700">订单未上传原图文件</span>
         </template>
       </div>
-      <el-row :gutter="20">
+      <el-row :gutter="0" type="flex" >
         <el-col :span="15">
-          <el-tag size="small" style="margin-left: 30px" effect="dark">基本信息</el-tag>
+          <el-tag style="margin-left: 30px" effect="dark">基本信息</el-tag>
         </el-col>
       </el-row>
-      <el-row :gutter="10">
-        <el-col :span="3">
-          <el-form-item size="small" label="下单客户">
-            <el-input v-model="form.clientName" disabled></el-input><!--新建时下拉选择,其他时候不能编辑-->
+      <el-row :gutter="0">
+        <el-col :span="4">
+          <el-form-item  size="small" label="下单客户">
+            <el-input
+              v-model="form.clientName"
+              disabled
+              class="input-with-select"
+              @click.native="createInnerVisible = true;innerType = 2;innerTitle ='选择客户'"
+            >
+              <el-button
+                slot="append"
+                @click="createInnerVisible = true;innerType = 2;innerTitle ='选择客户'">选择
+              </el-button>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-form-item size="small" label="产品类型">
-            <el-input v-model="form.productName" disabled></el-input><!--新建时下拉选择,其他时候不能编辑-->
+          <el-form-item  label-width="75px" size="small" label="产品类型">
+            <el-select
+              filterable
+              v-model="form.productName">
+              <el-option
+                v-for="item in productNameOptions"
+                :key="item.id"
+                :label="item.dictLabel"
+                :value="item.dictValue">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="3">
-          <el-form-item size="small" label="产品名称">
-            <el-input v-model="form.orderName" disabled></el-input><!--新建时下拉选择,其他时候不能编辑-->
+        <el-col :span="4">
+          <el-form-item label-width="75px"  size="small" label="产品名称">
+            <el-input v-model="form.orderName" ></el-input><!--新建时下拉选择,其他时候不能编辑-->
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-form-item size="small" label="联数">
-            <el-input v-model="form.receiptsCount" disabled></el-input><!--新建时下拉选择,其他时候不能编辑-->
+          <el-form-item label-width="50px"  size="small" label="联数">
+            <el-select
+              filterable
+              v-model="form.receiptsCount">
+              <el-option
+                v-for="item in receiptsCountOptions"
+                :key="item.id"
+                :label="item.dictLabel"
+                :value="item.dictValue">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="3">
-          <el-form-item size="small" label="材料类型">
-            <el-input v-model="form.paperName" disabled></el-input><!--新建时下拉选择,其他时候不能编辑-->
+        <el-col :span="4">
+          <el-form-item  label-width="75px"  size="small" label="材料类型">
+            <el-select
+              filterable
+              allow-create
+              v-model="form.paperName">
+              <el-option
+                v-for="item in paperNameOptions"
+                :key="item.id"
+                :label="item.dictLabel"
+                :value="item.dictValue">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-form-item size="small" label="每本页数">
-            <el-input v-model="form.pageCount" disabled></el-input><!--新建时下拉选择,其他时候不能编辑-->
+          <el-form-item label-width="75px"  size="small" label="每本页数">
+            <el-select
+              filterable
+              allow-create
+              v-model="form.pageCount">
+              <el-option
+                v-for="item in pageCountOptions"
+                :key="item.id"
+                :label="item.dictLabel"
+                :value="item.dictValue">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-form-item size="small" label="印刷颜色">
-            <el-input v-model="form.printColor" disabled></el-input><!--新建时下拉选择,其他时候不能编辑-->
+          <el-form-item label-width="75px"  size="small" label="印刷颜色">
+            <el-select
+              filterable
+              allow-create
+              v-model="form.printColor">
+              <el-option
+                v-for="item in printColorOptions"
+                :key="item.id"
+                :label="item.dictLabel"
+                :value="item.dictValue">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="10">
         <el-col :span="10">
-          <el-form-item size="small" label="生产工艺">
+          <el-form-item  size="small" label="生产工艺">
             <el-checkbox v-model="form.printCodeFlag">打码</el-checkbox>
             <el-checkbox v-model="form.printCoverFlag">封面</el-checkbox>
             <el-checkbox v-model="form.printMatFlag">加垫</el-checkbox>
@@ -94,7 +152,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="15">
-          <el-tag size="small" style="margin-left: 30px" type="success" effect="dark">报价信息</el-tag>
+          <el-tag style="margin-left: 30px" type="success" effect="dark">报价信息</el-tag>
         </el-col>
       </el-row>
       <el-row :gutter="24" type="flex" justify="left">
@@ -106,7 +164,7 @@
               style="width: 63%"
               v-model="form.printQty">
               <el-option
-                v-for="item in copiesProductSizeOptions"
+                v-for="item in printQtyOptions"
                 :key="item.id"
                 :label="item.dictLabel"
                 :value="item.dictValue">
@@ -134,7 +192,7 @@
               allow-create
               v-model="form.sendKind">
               <el-option
-                v-for="item in copiesProductSizeOptions"
+                v-for="item in sendKindOptions"
                 :key="item.id"
                 :label="item.dictLabel"
                 :value="item.dictValue">
@@ -171,7 +229,7 @@
       </el-row>
       <el-row :gutter="24" type="flex" justify="left">
             <el-col :span="15">
-              <el-tag size="small" style="margin-left: 30px" type="warning" effect="dark">外发信息</el-tag>
+              <el-tag style="margin-left: 30px" type="warning" effect="dark">外发信息</el-tag>
         </el-col>
       </el-row>
       <el-row :gutter="2" type="flex" justify="left">
@@ -237,7 +295,7 @@
       </el-row>
       <el-row :gutter="24" type="flex" justify="left">
           <el-col :span="15">
-            <el-tag size="small" style="margin-left: 30px" type="danger" effect="dark">成本信息</el-tag>
+            <el-tag style="margin-left: 30px" type="danger" effect="dark">成本信息</el-tag>
           </el-col>
       </el-row>
       <el-row :gutter="2" type="flex" justify="left">
@@ -264,12 +322,9 @@
 <script>
 import {
   getDetailPrintOrder, getWorkProcessList,
-  getProductDetailInfo, getAddressInfo, getshipAreaListInfo, getshipModeListInfo,
-  getLogisticsInfoList,
+  getProductDetailInfo, getAddressInfo,
   addPrintOrder, addAndCommitPrintOrder, updatePrintOrder, editAndCommitPrintOrder,
-  calcOrderSendDate,
-  quotePrintOrder,
-  orderFormToken, parseAddress,
+  calcOrderSendDate, parseAddress,
   reprintCommitOrder, reprintOrder, getClientBalanceMoneyWeb
 } from '@/api/order/orderDetail.js'
 import basePaperInfo from '@/views/baseInfo/paper/basePaperInfo'
@@ -287,50 +342,41 @@ import clientInfo from '@/views/doc/client/clientList'
 
 const form = {
   /* 订单信息*/
-  businessKind: '',
-  fileDescription: '',
-  originFileLink: '',
-  orderStatePrePay: '',
-  voidFlag: '',
-  orderState: '', // 订单状态
-  orderName: '', // 订单名称
-  idProduct: '', // 产品ID
-  idClient: '', // 客户id
-  clientName: '', // 客户名称
-  productName: '', // 产品类型
-  productSize: '', // 产品规格
-  orderQty: '', // 订单印量
-  kindCount: '', // 款数
-  printRequire: '', // 印刷要求
-  cutKind: '', // 成品裁切
-  packRequire: '', // 打包要求
-  boxRequire: '', // 包装要求
-  packKind: 0, // 打包方式 0均匀打包、1按要求打包
-  orderMemo: '', // 订单备注
-  orderType: '', // 订单类型
-  sendMemo: '', // 发货备注
-  deliverDate: '', // 交货日期
-  deliverTime: '',//交货时间
-  paperRequireFlag: 0,
-  traceFlag: 0,
-  usePreStore: 0,
-  /* 发货信息*/
-  sendAddressList: [],
-
-  needImageProcess: 0,
-  rePrintNeedImageProcess: 0,
-
-  /* 价格信息*/
-  orderMoneyTotal: 0, // 总金额
-  orderPrice: 0, // 订单价格
-  orderMoneyPre: 0, // 订单定金
-  orderMoneyPrint: 0, // 印工金额
-  orderMoneyProcess: 0, // 后工金额
-  orderMoneySend: '', // 订单运费
-  payKind: '', // 付款方式
-
-  // 部件信息
-  partList: [],
+  orderState: '',
+  idClient: '',
+  clientName: '',
+  productName: '',
+  orderName: '',
+  receiptsCount: '',
+  paperName: '',
+  pageCount: '',
+  printColor: '',
+  printCodeFlag: '',
+  printCoverFlag: '',
+  printMatFlag: '',
+  printNotCodeFlag: '',
+  printAllCoverFlag: '',
+  printQty: '',
+  printQtyUnit: '',
+  printPrice: '',
+  printMoneyTotal: '',
+  sendKind: '',
+  sendAddress: '',
+  orderMemo: '',
+  orderKind: '',
+  outWorkDept: '',
+  outWorkFactory: '',
+  outQty: '',
+  outPrice: '',
+  outMoneyTotal: '',
+  outSendMoney: '',
+  sendDate: '',
+  sendDatelong: '',
+  outAddress: '',
+  outMemo: '',
+  orderCost: '',
+  orderGrossProfit: '',
+  orderGrossProfitRate: '',
   versionCode: ''
 }
 
@@ -416,6 +462,20 @@ export default {
       printRequireOptions: [],
       printRequireOption: [],
       orderPrintOptions: [],
+      productNameOptions: [], //产品类型
+      productNameOption: [],
+      receiptsCountOptions: [], //联数
+      receiptsCountOption: [],
+      paperNameOptions: [],  //材料类型
+      paperNameOption: [],
+      pageCountOptions: [],  //每本页数
+      pageCountOption: [],
+      printColorOptions: [],  //印刷颜色
+      printColorOption: [],
+      printQtyOptions: [],  //数量
+      printQtyOption: [],
+      sendKindOptions: [],  //送货方式
+      sendKindOption: [],
       packingMethodOptions: [],
       parameterChooseVisible: false, // 参数选择弹窗
       parameterChooseType: 1,
@@ -604,7 +664,6 @@ export default {
     if (this.orderCategory != 1) {
       this.setTagsViewTitle()
     }
-    this.getToken()
   },
   watch: {
     // 印刷要求
@@ -640,6 +699,12 @@ export default {
         _that.$message.error(err)
       })
     },
+    chooseClient(data) {
+      this.createInnerVisible = false
+      // console.log(data);
+      this.createInfo.clientName = data.clientName
+      this.createInfo.idClient = data.id
+    },
     chooseClientByPay(data) {
       this.createInnerVisible = false
       // console.log(data);
@@ -682,12 +747,6 @@ export default {
       // console.log("route",route)
       this.$store.dispatch('tagsView/updateVisitedView', route)
     },
-    getToken() {
-      orderFormToken().then(res => {
-        // console.log(res);
-        this.formToken = res.data
-      })
-    },
 
     // 初始化页面
     init() {
@@ -709,11 +768,13 @@ export default {
       }
       _that.balanceMoney = 0;
       _that.balanceSpan = false;
-      _that.getDictInfo('PrintRequire')
-      _that.getDictInfo('OrderPrintDesc')
-      _that.getDictInfo('PackingMethod')
-      _that.getAreaList()
-      _that.getSendKind()
+      _that.getDictInfo('printQty')
+      _that.getDictInfo('printColor')
+      _that.getDictInfo('pageCount')
+      _that.getDictInfo('paperName')
+      _that.getDictInfo('receiptsCount')
+      _that.getDictInfo('productName')
+      _that.getDictInfo('sendKind')
     },
 
     // 获取订单详情
@@ -1115,44 +1176,6 @@ export default {
         _that.sendAddressList = []
       })
     },
-    // 获取发货方式
-    getSendKind() {
-      var _that = this
-      getshipModeListInfo().then(response => {
-        // console.log('getSendKind', response)
-        _that.sendKinds = response.data
-      }).catch(err => {
-        // console.log(err)
-      })
-    },
-    // 获取物流档案
-    getLogisticsInfo() {
-      var _that = this
-      var data = {
-        params: {
-          enable: 1
-        }
-      }
-      getLogisticsInfoList(data).then(response => {
-        // console.log('getSendKind', response)
-        _that.sendKinds = response.data
-      }).catch(err => {
-        // console.log(err)
-      })
-    },
-    // 获取发货区域
-    getAreaList() {
-      var _that = this
-      getshipAreaListInfo().then(response => {
-        // console.log('shipArea', response)
-        const data = response.data
-        // //  组合表单数据
-        _that.shipAreaList = response.data
-        // console.log(_that.shipAreaList);
-      }).catch(err => {
-        // console.log(err)
-      })
-    },
     // 修改省市区
     changeAddress(value, index) {
       var _that = this
@@ -1172,12 +1195,20 @@ export default {
       getDictTypeInfo(data).then(response => {
         // console.log(response)
         const data = response.data
-        if (typeText == 'PrintRequire') {
-          _that.printRequireOptions = data
-        } else if (typeText == 'OrderPrintDesc') {
-          _that.orderPrintOptions = data
-        } else if (typeText == 'PackingMethod') {
-          _that.packingMethodOptions = data
+        if (typeText == 'productName') {
+          _that.productNameOptions = data
+        } else if (typeText == 'receiptsCount') {
+          _that.receiptsCountOptions = data
+        } else if (typeText == 'paperName') {
+          _that.paperNameOptions = data
+        } else if (typeText == 'pageCount') {
+          _that.pageCountOptions = data
+        } else if (typeText == 'printColor') {
+          _that.printColorOptions = data
+        } else if (typeText == 'printQty') {
+          _that.printQtyOptions = data
+        } else if (typeText == 'sendKind') {
+          _that.sendKindOptions = data
         }
       }).catch(err => {
         _that.$message.error(err)
@@ -1226,155 +1257,7 @@ export default {
       sendAddressItem.sendProvince = row.province
       sendAddressItem.sendCity = row.city
       sendAddressItem.sendDistrict = row.area
-
-      var addressOption = []
-      if (row.province) {
-        addressOption.push(TextToCode[row.province].code)
-        addressOption.push(TextToCode[row.province][row.city].code)
-        addressOption.push(TextToCode[row.province][row.city][row.area].code)
-      }
-      if (row.shipModeName) {
-        this.sendKindChange(row.shipModeName)
-      }
-      ;
-
-      if (this.addressType == 0) {
-        this.sendAddressList.splice(0, 1, sendAddressItem)
-
-        this.addressOption.splice(0, 1, addressOption)
-        // this.sendAddressList[0] = sendAddressItem
-        // console.log(this.sendAddressList)
-      } else {
-        this.sendAddressList.push(sendAddressItem)
-
-        this.addressOption.push(addressOption)
-      }
-      this.$refs.address.outerVisible = false
-    },
-    // 增加收货地址
-    addAddressItem() {
-      var sendAddressItem = Object.assign({}, sendAddressInfo)
-      this.sendAddressList.push(sendAddressItem)
-      this.addressOption.push([])
-      this.getSendKind()
-    },
-    // 选择物流档案
-    chooseLogistics(row) {
-      const _that = this
-      // console.log(row)
-      if (row.sendType) {
-        _that.getLogisticsInfo()
-      } else {
-        _that.getSendKind()
-      }
-    },
-    currentAddress(row, event, column) {
-      const _that = this
-      if (row.sendType) {
-        _that.getLogisticsInfo()
-      } else {
-        _that.getSendKind()
-      }
-    },
-    // 删除收货地址
-    deleteAddressItem(index) {
-      this.sendAddressList.splice(index, 1)
-      this.addressOption.splice(index, 1)
-    },
-    // 验证尺寸
-    verifies1(value, parameterName) {
-      var reg = /^(\d+([.]\d+)?)\*(\d+([.]\d+)?)$/;
-      if (!reg.test(value)) {
-        this.$message.error('请输入正确的' + parameterName)
-        return
-      }
     },
-    // 验证尺寸
-    verifies2(value, parameterName) {
-      var reg = /^(\d+([.]\d+)?)\*(\d+([.]\d+)?)\*(\d+([.]\d+)?)$/;
-      if (!reg.test(value)) {
-        this.$message.error('请输入正确的' + parameterName)
-        return
-      }
-    },
-    // 增加部件
-    addPartBtn(command) {
-      var _that = this
-      var partInfo = _that.createPartArrByAdd(command)
-      _that.partListNew.push(partInfo[command])
-      _that.$nextTick(() => {
-        _that.partProcessList.forEach((processList, index) => {
-          if (index == _that.partProcessList.length - 1) {
-            processList.forEach(process => {
-              if (process.isRequired == 0) {
-                var name = 'partProcess' + (_that.partProcessList.length - 1)
-                _that.$refs[name][0].toggleRowSelection(process, true)
-              }
-            })
-          }
-        })
-      })
-    },
-    // 复制部件
-    copyPartInfo(indexNo) {
-      var _that = this
-      _that.copeNumVisible = true
-      _that.copeindex = indexNo
-      _that.copeNum = ''
-      // _that.copeFun();
-    },
-    copeFun() {
-      var _that = this;
-      var partItem = JSON.parse(JSON.stringify(_that.partListNew[_that.copeindex]))
-      var processItem = JSON.parse(JSON.stringify(_that.partProcessList[_that.copeindex]))
-      // console.log(partItem);
-      partItem.paramValueList.forEach(item => {
-        item.id = 0
-      })
-      // console.log(processItem);
-      processItem.forEach(item => {
-        item.id = 0
-      })
-      // partItem.processList.forEach(item =>{
-      //   // console.log('processList',item);
-      //   item.id = 0
-      // })
-      partItem.id = ''
-      for (let i = 0; i < _that.copeNum; i++) {
-        _that.partListNew.push(JSON.parse(JSON.stringify(partItem)))
-        _that.partProcessList.push(JSON.parse(JSON.stringify(processItem)))
-        _that.selectedProcessList.push([])
-      }
-      _that.copeNumVisible = false
-      _that.$nextTick(() => {
-        for (let i = 1; i <= _that.copeNum; i++) {
-          _that.partProcessList.forEach((processList, index) => {
-            if (index == _that.partProcessList.length - i) {
-              processList.forEach(process => {
-                _that.selectedProcessList[_that.copeindex].forEach((selected) => {
-                  if (process.idProcess == selected.idProcess) {
-                    var name = 'partProcess' + index
-                    _that.$refs[name][0].toggleRowSelection(process, true)
-                  }
-                })
-              })
-            }
-          })
-        }
-
-        // _that.partProcessList.forEach((processList, index) => {
-        //   if (index == _that.partProcessList.length - 1) {
-        //     processList.forEach(process => {
-        //       if (process.isRequired == 0) {
-        //         var name = 'partProcess' + (_that.partProcessList.length - 1)
-        //         _that.$refs[name][0].toggleRowSelection(process,true)
-        //       }
-        //     })
-        //   }
-        // })
-      })
-    },
-
     // 删除部件
     removePartInfo(indexNo) {
       var _that = this
@@ -1627,7 +1510,6 @@ export default {
           }
         }
         _that.addressOption.push(addressOption);
-        _that.getSendKind();
 
       }).catch(err => {
         _that.$message.error(err)