gitlab上面的wms转移到公司git

charles

2024-08-06 5ecb7958c96d3f0b6d47b79aff7eb306c2cf690f

 src/views/productManage/product/AddProductDialog.vue

@@ -86,6 +86,7 @@
                    <el-input
                      style="width: 85%"
                      :disabled="!showFooter"
                      clearable
                      v-model="editConfig.infomation.specs"
                      placeholder="请输入"
                    ></el-input>
@@ -95,6 +96,7 @@
                      v-model="editConfig.infomation.productType"
                      placeholder="请选择"
                      size="mini"
                      clearable
                      style="width: 85%"
                      :disabled="!showFooter"
                    >
@@ -141,11 +143,12 @@

                  <el-form-item label="单位" prop="unit">
                    <el-select
                      :disabled="!showFooter"
                      v-model="editConfig.infomation.unit"
                      placeholder="单位"
                      filterable
                      @change="$forceUpdate()"
                      style="width: calc(100% - 30px)"
                      @change="Gtechange"
                      style="width: calc(85% - 120px)"
                    >
                      <el-option
                        v-for="ele in unitList"
@@ -159,6 +162,12 @@
                      style="font-size: 20px; color: gray"
                      @click="handleUnitShow"
                    ></i>
                    <el-checkbox
                    class="margin_left_10px"
                    :disabled="editConfig.infomation.unit&&showFooter?false:true"
                    v-model="editConfig.infomation.moreUnit"
                    @change="moreUnitChange">启用多单位</el-checkbox>
                  <!-- <span class="margin_left_10px cursor_pointer"  @click="handleUnitMore">启用多单位</span> -->
                  </el-form-item>
                  
                  <el-form-item label="产品标签" prop="productTagName">
@@ -218,6 +227,8 @@
                      v-model="editConfig.infomation.categoryId"
                      placeholder="请选择"
                      size="mini"
                      clearable
                      filterable
                      style="width: 85%"
                      :disabled="!showFooter"
                    >
@@ -234,6 +245,7 @@
                    <el-input
                      style="width: 85%"
                      :disabled="!showFooter"
                      filterable
                      v-model="editConfig.infomation.type"
                      placeholder="请输入"
                    ></el-input>
@@ -255,9 +267,9 @@
                      :disabled="!showFooter"
                    ></el-input>
                  </el-form-item>
                  <el-form-item label="条码" prop="barcode">
                  <el-form-item label="条码" prop="barCode">
                    <el-input
                      v-model.trim="editConfig.infomation.barcode"
                      v-model.trim="editConfig.infomation.barCode"
                      placeholder="请输入"
                      size="mini"
                      style="width: 85%"
@@ -265,6 +277,23 @@
                    ></el-input>
                  </el-form-item>
                </div>
              </div>
              <div class="dynamic-attribute">
                <el-form-item  :label="attribute.name+':'" v-for="(attribute,index) in editConfig.attributeList" :key="attribute.id">
                  <el-select v-if="attribute.dataType==3" v-model="attribute.value" style="width: 60%">
                    <el-option  v-for="ele in attribute.selectValues" :label="ele" :value="ele" :key="ele"></el-option>
                  </el-select>
                  <el-input
                          v-else
                          v-model.trim="attribute.value"
                          :type="attribute.dataType==2?'number':'text'"
                          :placeholder="`请输入${attribute.name}`"
                          size="mini"
                          style="width: 60%"
                          :disabled="!showFooter"
                  ></el-input>
                  <el-button :disabled="editConfig.title==='查看'" size="mini" @click="deleteDynamicAttribute(index)" style="margin-left: 10px">删除</el-button>
                </el-form-item>
              </div>
              <div class="all">
                <!-- <div class="second-label">备注</div> -->
@@ -305,7 +334,7 @@
                      v-model="editConfig.infomation.principal"
                      placeholder="请选择"
                      size="mini"
                      style="width: 85%"
                      style="width: 88%"
                      disabled
                    >
                      <el-option
@@ -317,7 +346,7 @@
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item label="重量" prop="weight" label-width="80px">
                  <!-- <el-form-item label="重量" prop="weight" label-width="80px">
                    <el-input-number
                      v-model="editConfig.infomation.weight"
                      placeholder="请输入"
@@ -328,7 +357,63 @@
                      :disabled="!showFooter"
                    ></el-input-number>
                    <span> kg</span>
                  </el-form-item>
                  </el-form-item> -->
                  <el-form-item label="毛重" prop="grossWeight"  label-width="80px">
                  <el-col :span="15"
                >
                    <el-input
                        v-model="editConfig.infomation.grossWeight"
                        placeholder="请输入"
                        :disabled="!showFooter"
                      ></el-input>
                  </el-col>
                  <el-col :span="1">&nbsp;</el-col>
                  <el-col :span="5">
                  <el-select
                    v-model="editConfig.infomation.grossUnit"
                    placeholder="单位"
                    filterable
                    :disabled="!showFooter"
                    style="width: 100%; float: right"
                    :popper-append-to-body="false"
                  >
                    <el-option
                      v-for="ele in grossUnitList"
                      :key="ele.id"
                      :label="ele.name"
                      :value="ele.name"
                    ></el-option>
                  </el-select>
                  </el-col>
              </el-form-item>
              <el-form-item label="净重" prop="netWeight"  label-width="80px">
                <el-col :span="15"
              >
                  <el-input
                      v-model="editConfig.infomation.netWeight"
                      :disabled="!showFooter"
                      placeholder="请输入"
                    ></el-input>
                </el-col>
                <el-col :span="1">&nbsp;</el-col>
                 <el-col :span="5">
                <el-select
                  v-model="editConfig.infomation.netUnit"
                  placeholder="单位"
                  filterable
                  :disabled="!showFooter"
                  style="width: 100%; float: right"
                  :popper-append-to-body="false"
                >
                  <el-option
                    v-for="ele in grossUnitList"
                    :key="ele.id"
                    :label="ele.name"
                    :value="ele.name"
                  ></el-option>
                </el-select>
                </el-col>
              </el-form-item>
                  <el-form-item label="体积" prop="volume" label-width="80px">
                    <el-input-number
                      v-model="editConfig.infomation.volume"
@@ -537,26 +622,33 @@
    <BomDialog
      ref="editDialog"
      :editRow="editRow"
      @sucessSet="handleGetBomKindDictList"
      @handleConfirmSave="handleConfirmSave"
      :workList="unitList"
      title="计量单位"
    ></BomDialog>
    <UnitMoreDialog
      ref="unitMoreDialog"
      @saveUnitMore="saveUnitMore"
      @cancelUnitMore='cancelUnitMore'
      :workList="unitList"
      :unitRight='editConfig.infomation.unit'
      :dataList="editConfig.infomation.moreUnitList"
      title="启用多单位"
    ></UnitMoreDialog>
  </div>
</template>

<script>
import IconCropper from "./IconCropper"
import { getProductCategoryList } from "@/api/product/productCategory"
import { getProductList, addProduct, updateProduct } from "@/api/product/product"
import { uploadFiles, getUserInfo } from "@/api/common/other"
import { getProductList, addProduct, updateProduct,saveUnitDict } from "@/api/product/product"
import { uploadFiles, getUserInfo, } from "@/api/common/other"
import codeMixin from "@/components/mixin/codeMixin"
import { getDataByType } from "@/api/data"
import BomDialog from "./components/bomDialog";
import {getUnitInfo,  } from "@/api/basic/standard";
// import { postGetSaveSUnitDict  } from "@/api/basic/standard";


import UnitMoreDialog from "./components/UnitMoreDialog";
export default {
  mixins: [codeMixin],
  name: "AddProductDialog",
@@ -576,6 +668,7 @@
  components: { 
    IconCropper,
    BomDialog, 
    UnitMoreDialog,
  },
  computed: {
    modalTitle() {
@@ -597,9 +690,31 @@
        id: [{ required: true, validator: this.validateCheckCode, trigger: ["change", "blur"] }],
        model: [{ required: true, message: "请选择物料类型", trigger: "change" }],
        // salePrice: [{ required: true, message: "请输入销售价格", trigger: "blur" }],
        unit: [{ required: true, message: "请输入单位", trigger: ["change", "blur"] }],
        unit: [{ required: true, message: "请输入单位", trigger: ["blur"] }],
        // 采购类型
        purchaseTypeList: [{ required: true, message: "请选择", trigger: "blur" }]
        purchaseTypeList: [{ required: true, message: "请选择", trigger: "blur" }],
        netWeight: [
          {
            required: false,
            message: "请填写",
            trigger: "change",
          },
          {
            validator: this.validatorNumFour,
            trigger: "blur",
          },
        ],
        grossWeight: [
          {
            required: false,
            message: "请填写",
            trigger: "change",
          },
          {
            validator: this.validatorNumFour,
            trigger: "blur",
          },
        ],
      },
      memberOptions: [],
      productCategoryOptions: [], // 产品类别
@@ -657,6 +772,7 @@
      isView: false,
      fileFormdata: null, // 上传图片入参
      bomPurchaseTypeList: getDataByType("purchaseType"),
      grossUnitList:getDataByType("grossUnit"),
      unitList: [],
      editRow:{
        editDialogVisible:false,
@@ -683,43 +799,82 @@
    this.formInfo()
    this.getUserInfo()
    this.getUnitInfo()
    //this.queryAttribute()
  },
  methods: {
      deleteDynamicAttribute(index){
          this.editConfig.attributeList.splice(index,1);
      },

    validatorNumFour(rule, value, callback) {
      if (value != "") {
        if (value == undefined || value == null) {
          callback(new Error("请输入有效数字"));
        } else {
          let reg2 =
            /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
          if (!reg2.test(value) || value == 0) {
            callback(new Error("请填写大于零的2位小数的数字"));
          } else {
            callback();
          }
        }
      } else {
        callback();
      }
    },
    // 单位
    handleUnitShow() {
      this.handleGetBomKindDictList();
      this.editRow.editDialogVisible = true;
    },
    //  单位
    handleGetBomKindDictList(val) {
      console.log(val)
      // postGetUnitDictList().then((res) => {
      //   this.unitList = res.data;
      //   if (val) {
      //     for (let i in this.unitList) {
      //       if (this.unitList[i].isDefault) {
      //         this.form.unit = this.form.unit
      //           ? this.form.unit
      //           : this.unitList[i].name;
      //         // this.$set(this.form, "unit", this.form.unit);
      //         break;
      //       }
      //     }
      //   }
      // });
    // 启用多单位
    handleUnitMore(){
      if(this.editConfig.infomation.unit){
        this.$refs.unitMoreDialog.editDialogVisible = true;
      }else{
        this.$message.error('请先选择单位！')
      }
    },
    handleConfirmSave(data) {
      console.log(data)
      // postGetSaveSUnitDict({ data: data }).then((res) => {
      //   if (res.code == 200) {
      //     this.$message({
      //       message: "操作成功！",
      //       type: "success",
      //     });
      //     this.$refs.editDialog.editDialogVisible = false;
      //     this.handleGetBomKindDictList();
      //   }
      // });
    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.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;
        }
      }else{
        this.editConfig.infomation.moreUnit=false
        this.$message.error('请先选择单位！')
      }
      
    },
    handleConfirmSave(dataList) {
      saveUnitDict({ data: dataList }).then((res) => {
        if (res.code == 200) {
          this.$message({
            message: "操作成功！",
            type: "success",
          });
          this.getUnitInfo()
        }
      });
      this.editRow.editDialogVisible = false;

    },
@@ -860,6 +1015,12 @@
        params.codeStandardID = this.autoCodeObj.codeStandardID
        params.autoIncr = this.autoCodeObj.maxAutoIncr
      }
      if(params.moreUnitList&&params.moreUnitList.length>0){
        for(let i in params.moreUnitList){
          params.moreUnitList[i].amount=Number(params.moreUnitList[i].amount)
        }
      }
      params.attributes=this.editConfig.attributeList||[];
      requestUrl(params).then((res) => {
        console.log(res)
        this.editConfig.visible = false
@@ -1000,11 +1161,21 @@
        this.showSale = param
      }
    },
    Gtechange(){
      this.$forceUpdate()
    },
    // 获取单位列表数据
    async getUnitInfo(){
      await getUnitInfo().then((res)=>{
        if( this.editConfig.title==="新建"){
          res.data.map((item)=>{
            if(item.isDefault){
              this.editConfig.infomation.unit=item.name
            }
          })
        }
        this.editRow.BomTableData = res.data;
        console.log( this.editRow.BomTableData,"看下",res.data)
        this.unitList=res.data
      })
    }
  }
@@ -1013,6 +1184,16 @@

<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
  .dynamic-attribute{
    display:flex;
    flex-wrap: wrap;
    flex: 1;
    ::v-deep{
      .el-form-item{
        width: 50%;
      }
    }
  }
.dialog-header {
  display: flex;
  align-items: center;