Merge remote-tracking branch 'origin/master'

吴羡

19 小时以前 53bc8cc8fd330d5e2a4a3698967548a0b74a395a

 src/views/business/productOrder/components/addOrder.vue

@@ -2153,6 +2153,10 @@
    },
    // 保存模板
    addTemplateDia() {
      if (this.addObj.standardTreeId && (this.templateBindingLoading || this.boundTemplateList.length === 0)) {
        this.$message.error('请至少保留一个原始记录模板')
        return
      }
      if (this.templateName) {
        this.templateLoading = true;
        addInsOrderTemplate({
@@ -2161,7 +2165,10 @@
          thing: JSON.stringify({
            addObj: this.addObj,
            sampleList: this.sampleList,
            selectTree: this.selectTree
            selectTree: this.selectTree,
            templateList: this.addObj.standardTreeId
              ? this.boundTemplateList.map((item, index) => ({templateId: item.templateId, sort: index}))
              : undefined
          })
        }).then(res => {
          this.templateLoading = false;