695593266@qq.com 11 ヶ月 前
コミット
812189db09

+ 1 - 0
src/views/inspectionPlan/components/new-edit.vue

@@ -2281,6 +2281,7 @@
       handleExtractFull() {
         this.$refs.ruleForm.validate(async (valid) => {
           if (!valid || !this.validateSelection()) return;
+          this.isSampleList = false;
           this.baseForm.sampleMeasureUnit = this.formData.sampleUnit;
           this.sampleList = [];
           const sampleCount = Number(this.formData.portion);

+ 3 - 1
src/views/sample/samplemanagement/components/addOrEditSample.vue

@@ -158,7 +158,9 @@
         newData.categoryCode = data.code;
         newData.categoryName = data.name;
         newData.batchNo = data.brandNum;
-        newData.measureUnit = data.measuringUnit
+        newData.measureUnit = data.measuringUnit;
+        newData.weightUnit = data.weightUnit;
+        
         // if (data.measureType == 1) {
         //   newData.measureUnit = data.measuringUnit;
         // } else if (data.measureType == 2) {

+ 2 - 2
vue.config.js

@@ -33,10 +33,10 @@ module.exports = {
       '/api': {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.107:18086',
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',
-        // target: 'http://192.168.1.251:18186',
+        target: 'http://192.168.1.251:18186',
         // target: 'http://124.71.68.31:50001',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {