Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/plan/manufacturingorder/customerorder.vue

@@ -207,7 +207,7 @@
                  ></el-input
                ></el-form-item>
              </el-row>
            </el-card>
            <!-- </el-card> -->
          </el-tab-pane>
          <el-tab-pane label="附件" type="card" name="附件">
            <div style="display: flex;justify-content:flex-end;">
@@ -321,16 +321,6 @@
          </el-tab-pane>
        </el-tabs>
      </el-form>
      <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">取消</el-button>
      <el-button
        type="primary"
        :disabled="buttonDisable"
        v-thinclick="`dataFormSubmit`"
        v-if="editable"
        >确定</el-button
      >
    </span>
    </el-tab-pane>
  </el-tabs>
</template>
@@ -369,6 +359,8 @@
      fileList: [],
      title: '',
      orderParamList: [],
      progrecessFileLoading: false,
      editable: true,
      isFullScreen: false,
      visible: false,
      buttonDisable: false,
@@ -572,7 +564,6 @@
    //附件的查询
    downs(label, e){
      if(this.activeFileName=='附件'){
        console.log('1');
        getProcessConfigFile({
          orderNumber: this.dataForm.contractNo,
          lineNumber: this.dataForm.customerNo