Merge remote-tracking branch 'origin/master'

src/api/base/site.js

@@ -100,3 +100,22 @@ export const saveCompanyInformation = data => createAPI(`/base/saveCompanyInform
 
 // 删除停机原因
 export const deleteCompanyInformation = data => createAPI(`/base/deleteCompanyInformation`,'post',data)
+//------------维护工艺路线----------------
+//维护工艺路线
+export const searchRoutingWithPartNo= data => createAPI(`/base/searchRoutingWithPartNo`,'post',data)
+//工艺路线明细
+export const searchRoutingDetailData= data => createAPI(`/base/searchRoutingDetailData`,'post',data)
+//保存工艺路线
+export const saveRoutingDetailData= data => createAPI(`/base/saveRoutingDetailData`,'post',data)
+//删除工艺路线
+export const deleteRoutingDetail= data => createAPI(`/base/deleteRoutingDetail`,'post',data)
+//工艺路线工具查询
+export const searchRoutingToolData= data => createAPI(`/base/searchRoutingToolData`,'post',data)
+//工艺路线可用机台
+export const searchAllResource= data => createAPI(`/base/searchAllResource`,'post',data)
+//工艺路线已选机台
+export const searchUsedResource= data => createAPI(`/base/searchUsedResource`,'post',data)
+//添加机台
+export const addRoutingResource= data => createAPI(`/base/addRoutingResource`,'post',data)
+//删除机台
+export const deleteRoutingResource= data => createAPI(`/base/deleteRoutingResource`,'post',data)

src/views/modules/base/companyInformation.vue

@@ -347,7 +347,6 @@
         })
       },
       saveData(){
-        saveCompanyInformation(this.modelData).then(({data}) => {
           if(this.modelData.companyID==''||this.modelData.companyID==null){
             this.$alert("请输入会计单位编号！",'错误',{
               confirmButtonText:'确定'
@@ -381,6 +380,7 @@
             })
             return false;
           }
+        saveCompanyInformation(this.modelData).then(({data}) => {
           if (data && data.code == 200) {
             this.modelFlag = false
             this.getData();

src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue

@@ -802,7 +802,12 @@
         this.sum2 += newDate.allRollQty;
       },
       saveCRoll() {
-
+        if(this.dataForm.checked==true){
+          this.$alert('打印机连接失败！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
         let inData = {
           site: this.dataForm.site,
           partNo: this.dataForm.partNo
@@ -812,7 +817,6 @@
             this.dataForm.partDescription=data.rows[0].partDescription;
             //this.dataForm = JSON.parse(JSON.stringify(this.dataForm));
             let inData2={
-
               site : this.dataForm.site,
               supplierID : this.dataForm.supplierID
             }