src/views/productManage/product/AddProductDialog.vue
@@ -148,9 +148,8 @@
                      placeholder="单位"
                      filterable
                      @change="Gtechange"
                      style="width: calc(85% - 0px)"
                      style="width: calc(85% - 120px)"
                    >
                    <!-- style="width: calc(85% - 110px)" -->
                      <el-option
                        v-for="ele in unitList"
                        :key="ele.id"
@@ -163,13 +162,13 @@
                      style="font-size: 20px; color: gray"
                      @click="handleUnitShow"
                    ></i>
                    <!-- <el-checkbox
                    <el-checkbox
                    class="margin_left_10px"
                    :disabled="editConfig.infomation.unit&&showFooter?false:true"
                    v-model="editConfig.infomation.moreUnit"
                    @change="moreUnitChange"
                    ></el-checkbox
                  > -->
                    >启用多单位</el-checkbox
                  >
                  <!-- <span class="margin_left_10px cursor_pointer"  @click="handleUnitMore">启用多单位</span> -->
                  </el-form-item>
                  
@@ -231,6 +230,7 @@
                      placeholder="请选择"
                      size="mini"
                      clearable
                      filterable
                      style="width: 85%"
                      :disabled="!showFooter"
                    >
@@ -247,6 +247,7 @@
                    <el-input
                      style="width: 85%"
                      :disabled="!showFooter"
                      filterable
                      v-model="editConfig.infomation.type"
                      placeholder="请输入"
                    ></el-input>
@@ -318,7 +319,7 @@
                      v-model="editConfig.infomation.principal"
                      placeholder="请选择"
                      size="mini"
                      style="width: 85%"
                      style="width: 88%"
                      disabled
                    >
                      <el-option
@@ -342,7 +343,7 @@
                    ></el-input-number>
                    <span> kg</span>
                  </el-form-item> -->
                  <el-form-item label="毛重" prop="grossWeight">
                  <el-form-item label="毛重" prop="grossWeight"  label-width="80px">
                  <el-col :span="15"
                >
                    <el-input
@@ -352,7 +353,7 @@
                      ></el-input>
                  </el-col>
                  <el-col :span="1">&nbsp;</el-col>
                  <el-col :span="4">
                  <el-col :span="5">
                  <el-select
                    v-model="editConfig.infomation.grossUnit"
                    placeholder="单位"
@@ -370,7 +371,7 @@
                  </el-select>
                  </el-col>
              </el-form-item>
              <el-form-item label="净重" prop="netWeight">
              <el-form-item label="净重" prop="netWeight"  label-width="80px">
                <el-col :span="15"
              >
                  <el-input
@@ -380,7 +381,7 @@
                    ></el-input>
                </el-col>
                <el-col :span="1">&nbsp;</el-col>
                 <el-col :span="4">
                 <el-col :span="5">
                <el-select
                  v-model="editConfig.infomation.netUnit"
                  placeholder="单位"
@@ -613,7 +614,9 @@
    <UnitMoreDialog
      ref="unitMoreDialog"
      @saveUnitMore="saveUnitMore"
      @cancelUnitMore='cancelUnitMore'
      :workList="unitList"
      :unitRight='editConfig.infomation.unit'
      :dataList="editConfig.infomation.moreUnitList"
      title="启用多单位"
    ></UnitMoreDialog>
@@ -814,23 +817,34 @@
      }
    },
    saveUnitMore(list){
      this.editConfig.infomation.moreUnit=true
      this.editConfig.infomation.moreUnitList=list
    },
    cancelUnitMore(){
      this.editConfig.infomation.moreUnit=false
    },
    // 启用多单位的开关
    moreUnitChange(){
      let string=false;
      if(this.editConfig.infomation.moreUnitList&&this.editConfig.infomation.moreUnitList.length>0){
        for(let i in this.editConfig.infomation.moreUnitList){
          if(this.editConfig.infomation.moreUnitList[i].unit&&this.editConfig.infomation.moreUnitList[i].amount){
            string=true;
            break;
          }
      // let string=false;
      if(this.editConfig.infomation.unit){
        // if(this.editConfig.infomation.moreUnitList&&this.editConfig.infomation.moreUnitList.length>0){
        //   for(let i in this.editConfig.infomation.moreUnitList){
        //     if(this.editConfig.infomation.moreUnitList[i].unit&&this.editConfig.infomation.moreUnitList[i].amount){
        //       string=true;
        //       break;
        //     }
        //   }
        // }
        if(this.editConfig.infomation.moreUnit){
          // this.editConfig.infomation.moreUnit=false
          // this.$message.error('请先配置多单位!')
          this.$refs.unitMoreDialog.editDialogVisible = true;
        }
      }
      if(!string){
      }else{
        this.editConfig.infomation.moreUnit=false
        this.$message.error('请先配置多单位!')
        this.$message.error('请先选择单位!')
      }
    },
    handleConfirmSave(dataList) {
      saveUnitDict({ data: dataList }).then((res) => {
@@ -982,7 +996,7 @@
        params.codeStandardID = this.autoCodeObj.codeStandardID
        params.autoIncr = this.autoCodeObj.maxAutoIncr
      }
      if(params.moreUnitList.length>0){
      if(params.moreUnitList&&params.moreUnitList.length>0){
        for(let i in params.moreUnitList){
          params.moreUnitList[i].amount=Number(params.moreUnitList[i].amount)
        }